|
@@ -129,6 +129,7 @@ public class CwjsPolicyInfoController {
|
|
|
if(cwjsPolicyInfo==null) {
|
|
if(cwjsPolicyInfo==null) {
|
|
|
return Result.error("政策不存在或已被删除,请重新选择要审核的政策。");
|
|
return Result.error("政策不存在或已被删除,请重新选择要审核的政策。");
|
|
|
}
|
|
}
|
|
|
|
|
+ cwjsPolicyInfo.setLoginUserId(userId);
|
|
|
//获取 公司主题
|
|
//获取 公司主题
|
|
|
Integer companySubjectId = cwjsPolicyInfo.getCompanySubjectId();
|
|
Integer companySubjectId = cwjsPolicyInfo.getCompanySubjectId();
|
|
|
|
|
|
|
@@ -278,7 +279,7 @@ public class CwjsPolicyInfoController {
|
|
|
policyApprovalLog.setPolicyId(id);
|
|
policyApprovalLog.setPolicyId(id);
|
|
|
policyApprovalLog.setCreateUserId(userId);
|
|
policyApprovalLog.setCreateUserId(userId);
|
|
|
policyApprovalLog.setApprovalStatus(0);
|
|
policyApprovalLog.setApprovalStatus(0);
|
|
|
- policyApprovalLog.setApprovalContent(approvalContent);
|
|
|
|
|
|
|
+ policyApprovalLog.setApprovalContent(Check.isNull(approvalContent) ? "审核通过" : approvalContent);
|
|
|
policyApprovalLog.setCreateTime(new Date());
|
|
policyApprovalLog.setCreateTime(new Date());
|
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
|
|
|
|
|
@@ -297,7 +298,7 @@ public class CwjsPolicyInfoController {
|
|
|
|
|
|
|
|
policyApprovalLog.setPolicyId(id);
|
|
policyApprovalLog.setPolicyId(id);
|
|
|
policyApprovalLog.setCreateUserId(userId);
|
|
policyApprovalLog.setCreateUserId(userId);
|
|
|
- policyApprovalLog.setApprovalContent(approvalContent);
|
|
|
|
|
|
|
+ policyApprovalLog.setApprovalContent(Check.isNull(approvalContent) ? "审核拒绝" : approvalContent);
|
|
|
policyApprovalLog.setCreateTime(new Date());
|
|
policyApprovalLog.setCreateTime(new Date());
|
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
|
|
|
|