|
@@ -276,7 +276,8 @@ public class CwjsPolicyInfoController {
|
|
if(userIds.contains(userId) && cwjsPolicy.getApprovedStatus() == 4){ //创建人是自己且状态是审核拒绝的
|
|
if(userIds.contains(userId) && cwjsPolicy.getApprovedStatus() == 4){ //创建人是自己且状态是审核拒绝的
|
|
cwjsPolicy.setOperation("查看|编辑|提交审核");
|
|
cwjsPolicy.setOperation("查看|编辑|提交审核");
|
|
}
|
|
}
|
|
- if(userIds.contains(cwjsPolicy.getApprovedProgress()) && (cwjsPolicy.getApprovedStatus() == 1 || cwjsPolicy.getApprovedStatus() == 2)){
|
|
|
|
|
|
+
|
|
|
|
+ if(userId.equals(cwjsPolicy.getApprovedProgress()) && (cwjsPolicy.getApprovedStatus() == 1 || cwjsPolicy.getApprovedStatus() == 2)){
|
|
cwjsPolicy.setOperation("查看|审核通过|审核拒绝");
|
|
cwjsPolicy.setOperation("查看|审核通过|审核拒绝");
|
|
}
|
|
}
|
|
// 用户 公司
|
|
// 用户 公司
|
|
@@ -377,19 +378,25 @@ public class CwjsPolicyInfoController {
|
|
cwjsPolicyInfo.setApprovedProgress(cwjsCompanyApprovalUser.getApprovalUserId());
|
|
cwjsPolicyInfo.setApprovedProgress(cwjsCompanyApprovalUser.getApprovalUserId());
|
|
}
|
|
}
|
|
});
|
|
});
|
|
- //如果满足有审核人员等于当前创建的人,并且
|
|
|
|
- cwjsCompanyApprovalUsers.forEach(cwjsCompanyApprovalUser -> {
|
|
|
|
- if(cwjsCompanyApprovalUser.getApprovalUserId().equalsIgnoreCase(cwjsPolicyInfo.getCreateUserId())){
|
|
|
|
- CwjsCompanyApprovalUser approvalUserNext = companyApprovalUserMapper.queryByCompanySubjectIdAndLevel(companySubjectId, cwjsCompanyApprovalUser.getLevel()+1);
|
|
|
|
- if(Check.isNull(approvalUserNext)){
|
|
|
|
- cwjsPolicyInfo.setApprovedStatus(3);
|
|
|
|
- cwjsPolicyInfo.setApprovedProgress(null);
|
|
|
|
- }else{
|
|
|
|
- cwjsPolicyInfo.setApprovedStatus(2);
|
|
|
|
- cwjsPolicyInfo.setApprovedProgress(approvalUserNext.getApprovalUserId());
|
|
|
|
|
|
+ //如果满足有审核人员等于当前创建的人,
|
|
|
|
+ //当前用户 和 选择的销售(创建人) 相同
|
|
|
|
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ if(user.getId().equals(cwjsPolicyInfo.getCreateUserId())){
|
|
|
|
+ cwjsCompanyApprovalUsers.forEach(cwjsCompanyApprovalUser -> {
|
|
|
|
+ if(cwjsCompanyApprovalUser.getApprovalUserId().equalsIgnoreCase(cwjsPolicyInfo.getCreateUserId())){
|
|
|
|
+ CwjsCompanyApprovalUser approvalUserNext = companyApprovalUserMapper.queryByCompanySubjectIdAndLevel(companySubjectId, cwjsCompanyApprovalUser.getLevel()+1);
|
|
|
|
+ if(Check.isNull(approvalUserNext)){
|
|
|
|
+ cwjsPolicyInfo.setApprovedStatus(3);
|
|
|
|
+ cwjsPolicyInfo.setApprovedProgress(null);
|
|
|
|
+ }else{
|
|
|
|
+ cwjsPolicyInfo.setApprovedStatus(2);
|
|
|
|
+ cwjsPolicyInfo.setApprovedProgress(approvalUserNext.getApprovalUserId());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- }
|
|
|
|
- });
|
|
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
if(cwjsPolicyInfo.getAdvancePay() == 1){
|
|
if(cwjsPolicyInfo.getAdvancePay() == 1){
|
|
cwjsPolicyInfo.setIsDianPay(null);
|
|
cwjsPolicyInfo.setIsDianPay(null);
|