|
|
@@ -393,7 +393,11 @@ public class CwjsPolicyInfoController {
|
|
|
cwjsPolicy.setTheForwardingBossContent(Check.isNull(forwardContent) ? "" : forwardContent.getApprovalContent());
|
|
|
|
|
|
CwjsPolicyApprovalLog bossContent = policyApprovalLogMapper.getBossOneByPolicyId(cwjsPolicy.getId()); // 查询 老板审核意见 最新的一条
|
|
|
- cwjsPolicy.setTheBossContent(StringUtils.equals("终审通过",bossContent.getApprovalContent()) ? "-" : bossContent.getApprovalContent());
|
|
|
+ if (!Check.isNull(bossContent)){
|
|
|
+ cwjsPolicy.setTheBossContent(StringUtils.equals("终审通过",bossContent.getApprovalContent()) ? "-" : bossContent.getApprovalContent());
|
|
|
+ }else {
|
|
|
+ cwjsPolicy.setTheBossContent("-");
|
|
|
+ }
|
|
|
|
|
|
CwjsPolicyApprovalLog legalContent = policyApprovalLogMapper.getOneByPolicyLegalInfo(cwjsPolicy.getId()); // 查询 法务 审核意见 最新的一条
|
|
|
cwjsPolicy.setLegalAffairsContent(Check.isNull(legalContent) ? "" : legalContent.getApprovalContent());
|