|
@@ -328,15 +328,19 @@ public class CwjsPolicyInfoController {
|
|
CwjsCompanyApprovalUser approvalUser = companyApprovalUserMapper.getEndApprovalUserBySub(cwjsPolicy.getCompanySubjectId());
|
|
CwjsCompanyApprovalUser approvalUser = companyApprovalUserMapper.getEndApprovalUserBySub(cwjsPolicy.getCompanySubjectId());
|
|
//政策当前审核人 = 最后一个审核人 = 当前用户 && 状态不为3 审核通过 && 状态不为4 审核拒绝 || 当前用户 不是老板
|
|
//政策当前审核人 = 最后一个审核人 = 当前用户 && 状态不为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 {
|
|
}else {
|
|
cwjsPolicy.setTheBossRight("no");
|
|
cwjsPolicy.setTheBossRight("no");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
//所有人只要能看到就能有查看的按钮
|
|
//所有人只要能看到就能有查看的按钮
|
|
cwjsPolicy.setOperation("查看");
|
|
cwjsPolicy.setOperation("查看");
|
|
|
|
|