Merge remote-tracking branch 'origin/master'

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/controller/ItdmRunFlowPathController.java

@@ -202,13 +202,27 @@ public class ItdmRunFlowPathController extends JeecgController<ItdmRunFlowPath,
                     new ArrayList<>();
             List<String> roleIds = sysBaseApi.getRoleIdsByUsername(user.getUsername());
 
-
+            LoginUser loginUser = sysBaseApi.getUserByName(i.getFqUser());
             if (strings.contains(user.getUsername()) || roleIds.contains(i.getRoleId())) {
 
 
-                vos.add(FlowPathConvert.INSTANCE.to(i, true, i.getFlowPathSetp().equals(itdmRunFlowPath.getDqSetp()), x && i.getFlowPathSetp().equals(itdmRunFlowPath.getDqSetp()) ? weituoInfo : null));
+                ItdmRunFlowPathStepVO itdmRunFlowPathStepVO = FlowPathConvert.INSTANCE.to(i, true, i.getFlowPathSetp().equals(itdmRunFlowPath.getDqSetp()), x && i.getFlowPathSetp().equals(itdmRunFlowPath.getDqSetp()) ? weituoInfo : null);
+
+
+                itdmRunFlowPathStepVO.setFqUserName(loginUser != null ? loginUser.getRealname() : "");
+
+
+
+
+                vos.add(itdmRunFlowPathStepVO);
             } else {
-                vos.add(FlowPathConvert.INSTANCE.to(i, false, i.getFlowPathSetp().equals(itdmRunFlowPath.getDqSetp()), x && i.getFlowPathSetp().equals(itdmRunFlowPath.getDqSetp()) ? weituoInfo : null));
+
+                ItdmRunFlowPathStepVO itdmRunFlowPathStepVO=  FlowPathConvert.INSTANCE.to(i, false, i.getFlowPathSetp().equals(itdmRunFlowPath.getDqSetp()), x && i.getFlowPathSetp().equals(itdmRunFlowPath.getDqSetp()) ? weituoInfo : null);
+
+                itdmRunFlowPathStepVO.setFqUserName(loginUser != null ? loginUser.getRealname() : "");
+
+                vos.add(itdmRunFlowPathStepVO);
+
             }
 
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/vo/ItdmRunFlowPathStepVO.java

@@ -29,8 +29,13 @@ public class ItdmRunFlowPathStepVO {
     @ApiModelProperty(value = "步骤名称")
     private String name;
     /**最后修改人员*/
+
     @ApiModelProperty(value = "最后修改人员")
     private String fqUser;
+
+    private  String fqUserName;
+
+
     /**表单数据*/
     @ApiModelProperty(value = "表单数据")
     private String saveData;