|
@@ -147,9 +147,10 @@ public class CwjsPolicyInfoController {
|
|
|
cwjsPolicyInfoEntity.setApprovedProgress(cwjsCompanyApprovalUser2.getApprovalUserId());
|
|
|
}
|
|
|
});
|
|
|
- //如果满足有审核人员等于当前创建的人,并且
|
|
|
+ //如果满足 当前用户 是 审核人员 且 创建人
|
|
|
cwjsCompanyApprovalUsers.forEach(cwjsCompanyApprovalUser2 -> {
|
|
|
- if(cwjsCompanyApprovalUser2.getApprovalUserId().equalsIgnoreCase(cwjsPolicyInfoEntity.getCreateUserId())){
|
|
|
+ if(cwjsCompanyApprovalUser2.getApprovalUserId().equalsIgnoreCase(cwjsPolicyInfoEntity.getCreateUserId())
|
|
|
+ && cwjsCompanyApprovalUser2.getApprovalUserId().equalsIgnoreCase(userId)){
|
|
|
CwjsCompanyApprovalUser approvalUserNext = companyApprovalUserMapper.queryByCompanySubjectIdAndLevel(companySubjectId, cwjsCompanyApprovalUser2.getLevel()+1);
|
|
|
if(Check.isNull(approvalUserNext)){
|
|
|
cwjsPolicyInfoEntity.setApprovedStatus(3);
|