Commit 5c7c6b7e by jianan

审批时判断角色是否有权限问题2

parent b6548690
...@@ -171,7 +171,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService { ...@@ -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;
} }
} }
...@@ -205,7 +205,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService { ...@@ -205,7 +205,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
//判断当前操作人是否具有当前流程的审批权限 //判断当前操作人是否具有当前流程的审批权限
Integer currentStepSeq = requestVO.getHiringApproveStepsSeq(); Integer currentStepSeq = requestVO.getHiringApproveStepsSeq();
if (currentStepSeq == null) { if (currentStepSeq == null) {
responseVO.setCommonResult(new CommonResult(true, "审批已结束")); responseVO.setCommonResult(new CommonResult(false, "审批已结束"));
return; return;
} }
BeanPropertyValueEqualsPredicate predicate = new BeanPropertyValueEqualsPredicate("stepSeq", currentStepSeq); BeanPropertyValueEqualsPredicate predicate = new BeanPropertyValueEqualsPredicate("stepSeq", currentStepSeq);
...@@ -216,7 +216,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService { ...@@ -216,7 +216,7 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
//团队长之后的环节 //团队长之后的环节
String[] appointedMobileNos = step.getAppointedApprovePractitioners().split(","); String[] appointedMobileNos = step.getAppointedApprovePractitioners().split(",");
if (!Arrays.asList(appointedMobileNos).contains(mobileNo)) { if (!Arrays.asList(appointedMobileNos).contains(mobileNo)) {
responseVO.setCommonResult(new CommonResult(true, "无此流程的审批权限")); responseVO.setCommonResult(new CommonResult(false, "无此流程的审批权限"));
return; return;
} }
} else { } else {
...@@ -225,12 +225,12 @@ public class AgmsHiringServiceImpl implements AgmsHiringService { ...@@ -225,12 +225,12 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
AclPractitionerHiringMembership membership = membershipMapper.selectByHiringBasicInfoId(hiringBasicInfoId); AclPractitionerHiringMembership membership = membershipMapper.selectByHiringBasicInfoId(hiringBasicInfoId);
if ("subsystemOwner".equals(approveRole)) { if ("subsystemOwner".equals(approveRole)) {
if (!practitionerId.equals(membership.getSubsystemOwnerId())) { if (!practitionerId.equals(membership.getSubsystemOwnerId())) {
responseVO.setCommonResult(new CommonResult(true, "无此流程的审批权限")); responseVO.setCommonResult(new CommonResult(false, "无此流程的审批权限"));
return; return;
} }
} else { } else {
if (!practitionerId.equals(membership.getMentorPractitionerId())) { if (!practitionerId.equals(membership.getMentorPractitionerId())) {
responseVO.setCommonResult(new CommonResult(true, "无此流程的审批权限")); responseVO.setCommonResult(new CommonResult(false, "无此流程的审批权限"));
return; return;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment