Преглед изворни кода

政策-列表修改(拒绝后审核人为空)

yangzian пре 3 година
родитељ
комит
297f888260

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

@@ -328,15 +328,19 @@ public class CwjsPolicyInfoController {
 			CwjsCompanyApprovalUser approvalUser = companyApprovalUserMapper.getEndApprovalUserBySub(cwjsPolicy.getCompanySubjectId());
 			//政策当前审核人 = 最后一个审核人 = 当前用户   && 状态不为3 审核通过  && 状态不为4 审核拒绝  ||  当前用户 不是老板
 			// 则显示 转领导审批
-			if (cwjsPolicy.getApprovedProgress().equals(approvalUser.getApprovalUserId()) && approvalUser.getApprovalUserId().equals(userId)
-					&& cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4
-			&& !"80e747cdea6f41dbbc8cde23046fd4e0".equals(userId)){
-				cwjsPolicy.setTheBossRight("yes");
+
+			if(cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4){
+				if (cwjsPolicy.getApprovedProgress().equals(approvalUser.getApprovalUserId()) && approvalUser.getApprovalUserId().equals(userId)
+						&& !"80e747cdea6f41dbbc8cde23046fd4e0".equals(userId)){
+					cwjsPolicy.setTheBossRight("yes");
+				}
 			}else {
 				cwjsPolicy.setTheBossRight("no");
 			}
 
 
+
+
 			//所有人只要能看到就能有查看的按钮
             cwjsPolicy.setOperation("查看");