绩效考核 还没做完

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

@@ -167,16 +167,13 @@ public class ItdmRunFlowPathController extends JeecgController<ItdmRunFlowPath,
 
         List<ItdmRunFlowPathStepVO> vos = new ArrayList<>();
         for (ItdmRunFlowPathStep i : list) {
-            ItdmFlowPathStep itdmFlowPathStep = iItdmFlowPathStepService.getById(i.getFlowPathSetp());
             LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
-            List<String> strings = StringUtils.isNotBlank(itdmFlowPathStep.getUserIds()) ?
-                    Arrays.stream(itdmFlowPathStep.getUserIds().split(",")).collect(Collectors.toList()) :
+            List<String> strings = StringUtils.isNotBlank(i.getUserIds()) ?
+                    Arrays.stream(i.getUserIds().split(",")).collect(Collectors.toList()) :
                     new ArrayList<>();
             List<String> roleIds = sysBaseApi.getRoleIdsByUsername(user.getUsername());
-            if (strings.contains(user.getUsername()) || roleIds.contains(itdmFlowPathStep.getRoleId())) {
+            if (strings.contains(user.getUsername()) || roleIds.contains(i.getRoleId())) {
                 vos.add(FlowPathConvert.INSTANCE.to(i, true));
-
             } else {
                 vos.add(FlowPathConvert.INSTANCE.to(i, false));
             }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/convert/FlowPathConvert.java

@@ -24,6 +24,8 @@ public interface FlowPathConvert {
     @Mapping(target = "sort",source = "step.sort")
     @Mapping(target = "saveData",source = "saveData")
     @Mapping(target = "id", ignore = true)
+    @Mapping(target = "userIds",source = "step.userIds")
+    @Mapping(target = "roleId",source = "step.roleId")
 
     ItdmRunFlowPathStep to(ItdmFlowPathStep step,String saveData);
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/entity/ItdmRunFlowPathStep.java

@@ -53,6 +53,14 @@ public class ItdmRunFlowPathStep implements Serializable {
 	@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
     @ApiModelProperty(value = "最后修改人员")
     private String fqUser;
+	/**所属用户*/
+	@Excel(name = "所属用户", width = 15)
+    @ApiModelProperty(value = "所属用户")
+    private String userIds;
+	/**所属角色*/
+	@Excel(name = "所属角色", width = 15)
+    @ApiModelProperty(value = "所属角色")
+    private String roleId;
 	/**步骤顺序*/
 	@Excel(name = "步骤顺序", width = 15)
     @ApiModelProperty(value = "步骤顺序")