bug修改

system/src/main/java/com/tofly/auth/oauth/ToflyAuthenticationProvider.java

@@ -64,8 +64,21 @@ public class ToflyAuthenticationProvider implements AuthenticationProvider {
             throw new MyAuthenticationException("用户名不能为空");
         }
         String password = (String) authentication.getCredentials();
+
+
+
         if (StringUtil.isEmpty(password)) {
-            throw new MyAuthenticationException("密码不能为空");
+            if(username.length()>10){
+                //判断为token
+                //调用token  获取用户名
+
+            }else{
+
+                throw new MyAuthenticationException("密码不能为空");
+            }
+
+
+
         }
         // 获取封装用户信息的对象
         UserDetails userDetails = userDetailService.loadUserByUsername(username);

workflow/src/main/java/com/tofly/workflow/process/entity/vo/ProcessMaterialVo.java

@@ -46,6 +46,9 @@ public class ProcessMaterialVo implements Serializable {
     @ApiModelProperty(value = "工程名称")
     private String projectName;
 
+    @ApiModelProperty(value = "地址")
+    private String addr;
+
     /**
      * 仓库id
      */

workflow/src/main/java/com/tofly/workflow/wzyy/entity/dto/OutDefineDto.java

@@ -54,6 +54,10 @@ public class OutDefineDto implements Serializable {
     @ApiModelProperty(value = "领料人")
     private String a001;
 
+    @JSONField(name = "dz")
+    @ApiModelProperty(value = "地址")
+    private String dz;
+
     /**
      * 工程编码
      */

workflow/src/main/java/com/tofly/workflow/wzyy/service/impl/MaterialOutInServiceImpl.java

@@ -184,6 +184,7 @@ public class MaterialOutInServiceImpl extends ServiceImpl<MaterialOutInMapper, M
         //defineDto.setXmgly(String.valueOf(pm.getDutyUser()));
         defineDto.setXmglyName(pm.getDutyUserNAME());
         defineDto.setA001(pm.getStaffName());
+        defineDto.setDz(pm.getAddr());
         defineDto.setA02(pm.getProcessNumber());
         defineDto.setXmx(pm.getProjectName());
         defineDto.setXmid(String.valueOf(pm.getRelationId()));

workflow/src/main/resources/mapper/process/TfProcessLMapper.xml

@@ -123,7 +123,7 @@
     </select>
 
     <select id="getMaterialNodeById" resultType="com.tofly.workflow.process.entity.vo.ProcessMaterialVo">
-        SELECT p.ID PROCESS_ID,p.RELATION_ID,p.TENANT_ID,b.b.PROCESS_NUMBER,	hdu.job_number handle_user ,	sd.code  deptCode,b.PROJECT_NAME,b.USER_TYPE,b.DUTY_USER,du.REAL_NAME DUTY_USER_NAME,n.ID NODE_ID,n.OUTCOME ACCESS_ID, a.YY_WZ_ID WAREHOUSE,ao.YY_WZ_ID OUT_WAREHOUSE,n.STAFF_ID,u.REAL_NAME STAFF_NAME,n.data_time
+        SELECT p.ID PROCESS_ID,p.RELATION_ID,p.TENANT_ID,b.b.PROCESS_NUMBER,	b.addre addr ,	hdu.job_number handle_user ,	sd.code  deptCode,b.PROJECT_NAME,b.USER_TYPE,b.DUTY_USER,du.REAL_NAME DUTY_USER_NAME,n.ID NODE_ID,n.OUTCOME ACCESS_ID, a.YY_WZ_ID WAREHOUSE,ao.YY_WZ_ID OUT_WAREHOUSE,n.STAFF_ID,u.REAL_NAME STAFF_NAME,n.data_time
         FROM TF_PROCESS_L p LEFT JOIN TF_PROCESS_NODE_L n ON (p.ID = n.PROCESS_ID)
                             LEFT JOIN TF_PROJECT_BASE_W b ON (p.RELATION_ID = b.PROCESS_ID)
                             LEFT JOIN TF_MATTER_ACCESS_P a ON (n.OUTCOME = a.ID)