瀏覽代碼

政策-终审

yangzian 3 年之前
父節點
當前提交
884f785f84

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

@@ -169,17 +169,17 @@ public class CwjsPolicyInfoController {
 			 corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId,text.toString());
 		}
 		 if(type == 2){	//审核通过  是不是终审,不是就给当前的下一个人发企业微信
-			 CwjsCompanyApprovalUser nextApprovalUser = companyApprovalUserMapper.queryByCompanySubjectIdAndLevel(companySubjectId, cwjsCompanyApprovalUser.getLevel() + 1);
-			 if(!Check.isNull(cwjsCompanyApprovalUser) && Check.isNull(nextApprovalUser)){//没有下一个审核人员,是终审
+			 CwjsCompanyApprovalUser nextApprovalUser = null;
+			 //查询 下一个 审核人
+		 	if(!Check.isNull(cwjsCompanyApprovalUser)){
+				nextApprovalUser = companyApprovalUserMapper.queryByCompanySubjectIdAndLevel(companySubjectId, cwjsCompanyApprovalUser.getLevel() + 1);
+			}
+			 if(Check.isNull(nextApprovalUser)){//没有下一个审核人员,是终审
 				cwjsPolicyInfoEntity.setApprovedStatus(3);
-
 				 /**
 				  * 终审通过后 添加 起始时间
 				  */
-
 				 reportSettlementService.cwjsPRofit(cwjsPolicyInfoEntity);
-
-
 			}else{	//不是终审
 				cwjsPolicyInfoEntity.setApprovedStatus(2);
 				cwjsPolicyInfoEntity.setApprovedProgress(nextApprovalUser.getApprovalUserId());	//设置一下个人为审核人员