Procházet zdrojové kódy

政策-助理给总监创建;总监给自己创建审核人修改

yangzian před 3 roky
rodič
revize
e8bf4f12f8

+ 6 - 6
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -145,7 +145,7 @@ public class CwjsPolicyInfoController {
 		 String approvalUser = cwjsPolicyInfo.getApprovedProgress();
 
 		 //政策所属销售的部门 和 上级
-		 JSONObject examineUser = cwjsPolicyInfoMapper.getUserLeaderAndDirectorByRoleName(cwjsPolicyInfo.getSaleId(),"分公司总经理");
+		 JSONObject examineUser = cwjsPolicyInfoMapper.getUserLeaderAndDirectorByRoleName(cwjsPolicyInfo.getCreateUserId(),"分公司总经理");
 		 String firstAudit = "";//第一次审核人
 
 		 // 提交 - 待审核
@@ -578,7 +578,7 @@ public class CwjsPolicyInfoController {
 
 
 			//政策所属销售的部门 和 上级
-			JSONObject examineUser = cwjsPolicyInfoMapper.getUserLeaderAndDirectorByRoleName(cwjsPolicyInfo.getSaleId(),"分公司总经理");
+			JSONObject examineUser = cwjsPolicyInfoMapper.getUserLeaderAndDirectorByRoleName(cwjsPolicyInfo.getCreateUserId(),"分公司总经理");
 			String firstAudit = "";//第一次审核人
 
 			//普通销售,新增都是1,审核进度的人都是等级为0的审核人i
@@ -590,11 +590,11 @@ public class CwjsPolicyInfoController {
 				firstAudit = "legalAffairs";
 
 				//助理给销售总监创建
-			}else if (StringUtils.equals(roleCode,"saleDirector")){
-				//审核人是销售总监自己
-				firstAudit = cwjsPolicyInfo.getSaleId();
+			}else if (StringUtils.equals(cwjsPolicyInfo.getSaleId(),cwjsPolicyInfo.getCreateUserId()) && StringUtils.equals(roleCode,"saleDirector")){
+				//审核人是 销售的 上级
+				firstAudit = examineUser.getString("leaderId");
 			}else {
-				//销售的 上级
+				//创建人的 上级
 				firstAudit = examineUser.getString("leaderId");
 			}