wangliang 3 жил өмнө
parent
commit
c9f7e59944

+ 7 - 4
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ActivitiServiceImpl.java

@@ -545,10 +545,13 @@ public class ActivitiServiceImpl implements ActivitiService {
                     //获取命题已审
                     List<ApproveUserResult> approveUserMtResult = sysUserService.findById(flowApproveResult.getStartId());
                     flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowGdykdxApproveSetupEnum.SUBMIT.getSetup(), true, approveUserMtResult));
-                    //获取院长审批人
-                    Set<Long> orgIds = approveUserMtResult.stream().map(s -> s.getOrgId()).collect(Collectors.toSet());
-                    List<ApproveUserResult> sysUserPresidentList = sysUserService.findByPresidentApprove(new ArrayList<>(orgIds));
-                    flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowGdykdxApproveSetupEnum.SECOND_APPROVE.getSetup(), sysUserPresidentList));
+
+                    SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+                    if (Objects.nonNull(sysUser.getOrgId())) {
+                        //获取院长审批人
+                        List<ApproveUserResult> sysUserPresidentList = sysUserService.findByPresidentApprove(Arrays.asList(sysUser.getOrgId()));
+                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowGdykdxApproveSetupEnum.SECOND_APPROVE.getSetup(), sysUserPresidentList));
+                    }
                     break;
                 case 3:
                     if (Objects.isNull(flowApproveResult)) {