瀏覽代碼

Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

qiny 11 月之前
父節點
當前提交
41fa0048a2
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      zjugis-business/src/main/java/com/zjugis/business/flow/leave/event/LeaveEvent.java

+ 3 - 2
zjugis-business/src/main/java/com/zjugis/business/flow/leave/event/LeaveEvent.java

@@ -362,8 +362,9 @@ public class LeaveEvent extends BaseController {
         try {
             String flowInstanceId = flowInstance.get("id").toString();
             LeaveDO entity = leaveService.findByInstanceId(flowInstanceId);
-            DeptRespDTO deptRespDTO = deptApi.getSecondDeptByDeptId(entity.getDeptId()).getCheckedData();
-            if (entity != null && deptRespDTO!= null && entity.getUserId().equals(deptRespDTO.getLeaderUserId())) {
+            List<PostRespDTO> postList = postApi.getPostByUser(entity.getUserId()).getCheckedData();
+            Set<String> postCodes = convertSet(postList, PostRespDTO::getCode);
+            if (entity != null && CollectionUtil.contains(postCodes, "fgslz")) {
                 return "true";
             }
             return "false";