Merge branch 'dev_20210203_hiringUpdate' into dev

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsHiringServiceImpl.java

@@ -171,7 +171,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
             List<AclPractitionerHiringApproveRecords> recordsList = aclPractitionerHiringApproveRecordsDalService.queryListByBasicInfoId(hiringBasicInfoId);
             List<AclPractitionerHiringApproveRecords> recordsList = aclPractitionerHiringApproveRecordsDalService.queryListByBasicInfoId(hiringBasicInfoId);
             for (AclPractitionerHiringApproveRecords record : recordsList) {
             for (AclPractitionerHiringApproveRecords record : recordsList) {
                 if (record.getStepSeq().equals(String.valueOf(hiringApproveStepsSeq))) {
                 if (record.getStepSeq().equals(String.valueOf(hiringApproveStepsSeq))) {
-                    responseVO.setCommonResult(new CommonResult(true, "当前流程已审批，请勿重复提交"));
+                    responseVO.setCommonResult(new CommonResult(false, "当前流程已审批，请勿重复提交"));
                     return responseVO;
                     return responseVO;
                 }
                 }
             }
             }
@@ -202,6 +202,40 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
         Long hiringBasicInfoId = requestVO.getHiringBasicInfoId();
         Long hiringBasicInfoId = requestVO.getHiringBasicInfoId();
         //查询审批流程
         //查询审批流程
         List<MdPractitionerHiringApproveSteps> hiringApproveStepsList = systemConfigService.findHiringApproveStepsAll();
         List<MdPractitionerHiringApproveSteps> hiringApproveStepsList = systemConfigService.findHiringApproveStepsAll();
+        //判断当前操作人是否具有当前流程的审批权限
+        Integer currentStepSeq = requestVO.getHiringApproveStepsSeq();
+        if (currentStepSeq == null) {
+            responseVO.setCommonResult(new CommonResult(false, "审批已结束"));
+            return;
+        }
+        BeanPropertyValueEqualsPredicate predicate = new BeanPropertyValueEqualsPredicate("stepSeq", currentStepSeq);
+        List<MdPractitionerHiringApproveSteps> steps = (List<MdPractitionerHiringApproveSteps>) CollectionUtils.select(hiringApproveStepsList, predicate);
+        MdPractitionerHiringApproveSteps step = steps.get(0);
+
+        if (StringUtils.isNotEmpty(step.getAppointedApprovePractitioners())) {
+            //团队长之后的环节
+            String[] appointedMobileNos = step.getAppointedApprovePractitioners().split(",");
+            if (!Arrays.asList(appointedMobileNos).contains(mobileNo)) {
+                responseVO.setCommonResult(new CommonResult(false, "无此流程的审批权限"));
+                return;
+            }
+        } else {
+            //辅导人或团队长
+            String approveRole = step.getApproveRole();
+            AclPractitionerHiringMembership membership = membershipMapper.selectByHiringBasicInfoId(hiringBasicInfoId);
+            if ("subsystemOwner".equals(approveRole)) {
+                if (!practitionerId.equals(membership.getSubsystemOwnerId())) {
+                    responseVO.setCommonResult(new CommonResult(false, "无此流程的审批权限"));
+                    return;
+                }
+            } else {
+                if (!practitionerId.equals(membership.getMentorPractitionerId())) {
+                    responseVO.setCommonResult(new CommonResult(false, "无此流程的审批权限"));
+                    return;
+                }
+            }
+        }
+
         //保存审批结果
         //保存审批结果
         saveRecords(practitionerId, mobileNo, hiringApproveStepsList, requestVO, responseVO);
         saveRecords(practitionerId, mobileNo, hiringApproveStepsList, requestVO, responseVO);
 
 
@@ -524,7 +558,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
 
 
         StringBuilder messageText = new StringBuilder();
         StringBuilder messageText = new StringBuilder();
         messageText.append("银盾人事你好，");
         messageText.append("银盾人事你好，");
-        if ("30".equals(memberShip.getMdDropOptionId())) {
+        if (Long.valueOf("30").equals(memberShip.getMdDropOptionId())) {
             // XX 分公司的 XXX
             // XX 分公司的 XXX
             messageText.append(memberShip.getBranch()).append("的").append(basicInfo.getName());
             messageText.append(memberShip.getBranch()).append("的").append(basicInfo.getName());
         } else {
         } else {