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