yangzian 3 лет назад
Родитель
Сommit
505b48e2d5

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

@@ -257,7 +257,7 @@ public class CwjsPolicyInfoController {
 						 //查询审核人 上级
 						 JSONObject jsonObject = cwjsPolicyInfoMapper.getUserLeaderByUserId(cwjsPolicyInfo.getApprovedProgress());
 						 if (!Check.isNull(jsonObject) &&
-								 (StringUtils.equals(cwjsPolicyInfo.getApprovedProgress(),"1506873789009489921")
+								 (StringUtils.equals(cwjsPolicyInfo.getApprovedProgress(),"00d630a129e4487cba5427788a1f08ce")
 										 || StringUtils.equals(cwjsPolicyInfo.getApprovedProgress(),"7fb2684c348341d193727e791c75dbeb"))){
 
 							 // 下一步审核人
@@ -313,7 +313,7 @@ public class CwjsPolicyInfoController {
 			 }
 
 			 //老板
-			 if (approvalUser.equals(userId) && userId.equals("80e747cdea6f41dbbc8cde23046fd4e0")) {
+			 if (approvalUser.equals(userId) && userId.equals("4aba62011120ac565c7f2b9f8f4aa96b")) {
 				 cwjsPolicyInfo.setApprovedStatus(3);
 				 cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
 
@@ -474,10 +474,10 @@ public class CwjsPolicyInfoController {
 
 				if (StringUtils.equals("saleDirector",createRoleCode)){
 					directorUserId  = cwjsPolicy.getCreateUserId();
-				}else if(StringUtils.equals("1506873789009489921",examineUser.getString("leaderId")) ||
+				}else if(StringUtils.equals("00d630a129e4487cba5427788a1f08ce",examineUser.getString("leaderId")) ||
 						StringUtils.equals("7fb2684c348341d193727e791c75dbeb",examineUser.getString("leaderId"))) {
 					//当前审核人是 zhaowang 则下一步审核人是 dingzhaoming
-					directorUserId  = "08b7c7ba1f0c4f8abb6aa098452fd921";
+					directorUserId  = "b161b7d9793942f980dbfe8c931cd1b0";
 
 				}else {
 					directorUserId = examineUser.getString("leaderId");
@@ -495,7 +495,7 @@ public class CwjsPolicyInfoController {
 				cwjsPolicy.setTheBossRight("no");
 				if(cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4){
 					if (StringUtils.equals(cwjsPolicy.getApprovedProgress(),directorUserId) && directorUserId.equals(userId)
-							&& !"80e747cdea6f41dbbc8cde23046fd4e0".equals(userId)){
+							&& !"4aba62011120ac565c7f2b9f8f4aa96b".equals(userId)){
 
 						if(examineUser.getString("departName").contains("渠道")){
 							cwjsPolicy.setTheBossRight("yes");

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyApprovalLogMapper.xml

@@ -36,7 +36,7 @@
     <select id="getBossOneByPolicyId" resultType="org.jeecg.ctop.finance.policy.entity.CwjsPolicyApprovalLog">
         select * from ctop_cwjs_policy_approval_log
         where policy_id = #{policyId}
-          and create_user_id = '80e747cdea6f41dbbc8cde23046fd4e0'
+          and create_user_id = '4aba62011120ac565c7f2b9f8f4aa96b'
         order by create_time desc
             LIMIT 1
     </select>

+ 2 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsPolicyInfoServiceImpl.java

@@ -189,8 +189,8 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
     @Override
     public void automaticConveyBossExamine(CwjsPolicyInfo cwjsPolicyInfo) {
         cwjsPolicyInfo.setApprovedStatus(2);
-        cwjsPolicyInfo.setApprovedProgress("80e747cdea6f41dbbc8cde23046fd4e0");	//设置 boss 为审核人员
-        JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId("80e747cdea6f41dbbc8cde23046fd4e0");
+        cwjsPolicyInfo.setApprovedProgress("4aba62011120ac565c7f2b9f8f4aa96b");	//设置 boss 为审核人员
+        JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId("4aba62011120ac565c7f2b9f8f4aa96b");
         StringBuilder text = new StringBuilder();
         text.append("您有一条销售政策需要审核,该客户为:");
         text.append(cwjsPolicyInfo.getCompanyName());