|
|
@@ -130,6 +130,7 @@ public class CwjsPolicyInfoController {
|
|
|
return Result.error("政策不存在或已被删除,请重新选择要审核的政策。");
|
|
|
}
|
|
|
cwjsPolicyInfo.setLoginUserId(userId);
|
|
|
+ cwjsPolicyInfo.setApprovalContent(approvalContent);
|
|
|
//获取 公司主题
|
|
|
Integer companySubjectId = cwjsPolicyInfo.getCompanySubjectId();
|
|
|
|
|
|
@@ -392,7 +393,7 @@ public class CwjsPolicyInfoController {
|
|
|
cwjsPolicy.setTheForwardingBossContent(Check.isNull(forwardContent) ? "" : forwardContent.getApprovalContent());
|
|
|
|
|
|
CwjsPolicyApprovalLog bossContent = policyApprovalLogMapper.getBossOneByPolicyId(cwjsPolicy.getId()); // 查询 老板审核意见 最新的一条
|
|
|
- cwjsPolicy.setTheBossContent(Check.isNull(bossContent) ? "" : bossContent.getApprovalContent());
|
|
|
+ cwjsPolicy.setTheBossContent(StringUtils.equals("终审通过",bossContent.getApprovalContent()) ? "-" : bossContent.getApprovalContent());
|
|
|
|
|
|
CwjsPolicyApprovalLog legalContent = policyApprovalLogMapper.getOneByPolicyLegalInfo(cwjsPolicy.getId()); // 查询 法务 审核意见 最新的一条
|
|
|
cwjsPolicy.setLegalAffairsContent(Check.isNull(legalContent) ? "" : legalContent.getApprovalContent());
|