|
@@ -337,21 +337,9 @@ public class CwjsPolicyInfoController {
|
|
|
|
|
|
//手动-转领导审批 只有审核人是最后一个人的时候 才可以转领导
|
|
//手动-转领导审批 只有审核人是最后一个人的时候 才可以转领导
|
|
if (type == 4) {
|
|
if (type == 4) {
|
|
- //查询创建人角色
|
|
|
|
- String createUserRole = roleService.getRoleCodeByUserId(cwjsPolicyInfo.getCreateUserId());
|
|
|
|
- if (StringUtils.equals("saleDirector", createUserRole)) {
|
|
|
|
- if (approvalUser.equals(userId)) {
|
|
|
|
- cwjsPolicyInfoService.automaticConveyBossExamine(cwjsPolicyInfo);
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- // 最后一个审核人员
|
|
|
|
- if (!approvalUser.equals(examineUser.getString("leaderId")) && !approvalUser.equals(examineUser.getString("directorId"))) {
|
|
|
|
- return Result.errorMsg("当前审核人不是最后一个审核人员,无法转领导审批。");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- cwjsPolicyInfoService.automaticConveyBossExamine(cwjsPolicyInfo);
|
|
|
|
- }
|
|
|
|
|
|
+ cwjsPolicyInfoService.automaticConveyBossExamine(cwjsPolicyInfo);
|
|
}
|
|
}
|
|
|
|
+
|
|
cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
|
|
return Result.successMsg(type == 3 ? "审核拒绝" : "审核通过", cwjsPolicyInfo);
|
|
return Result.successMsg(type == 3 ? "审核拒绝" : "审核通过", cwjsPolicyInfo);
|
|
|
|
|