Skip to content

D
dc-cost-system
Commit e5d35bea by huluobin
Options

update

parent 67a0c78b
Showing with 2 additions and 2 deletions
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costcheck/DepartmentCheckState.java
...@@ -73,7 +73,7 @@ public class DepartmentCheckState extends CostState { ...@@ -73,7 +73,7 @@ public class DepartmentCheckState extends CostState {
//如果不需要审核 直接通过 //如果不需要审核 直接通过
DepartmentReviewer departmentReviewer = this.getCurrentDepartmentReviewer(oaDepartment.getDepartmentId()); DepartmentReviewer departmentReviewer = this.getCurrentDepartmentReviewer(oaDepartment.getDepartmentId());
if (!costTemplate.shouldDepartmentCheck(costDomain, departmentReviewer.getAutoReviewAmount())) { if (departmentReviewer != null && !costTemplate.shouldDepartmentCheck(costDomain, departmentReviewer.getAutoReviewAmount())) {
costDomain.setCostStatus(CostDomain.STATUS_HR_CHECK); costDomain.setCostStatus(CostDomain.STATUS_HR_CHECK);
costDomain.setLastModifyDate(LocalDateTime.now()); costDomain.setLastModifyDate(LocalDateTime.now());
...@@ -177,7 +177,7 @@ public class DepartmentCheckState extends CostState { ...@@ -177,7 +177,7 @@ public class DepartmentCheckState extends CostState {
CostDomain costDomain = costContext.costDomain; CostDomain costDomain = costContext.costDomain;
DepartmentReviewer departmentReviewer = this.getCurrentDepartmentReviewer(departmentId); DepartmentReviewer departmentReviewer = this.getCurrentDepartmentReviewer(departmentId);
if (departmentReviewer.getSecondDepartmentId() > 0) { if (departmentReviewer != null && departmentReviewer.getSecondDepartmentId() > 0) {
costLogService.save(costDomain.getCostNo(), 0, "匹配二级部门配置:" + departmentReviewer.getSecondDepartmentName()); costLogService.save(costDomain.getCostNo(), 0, "匹配二级部门配置:" + departmentReviewer.getSecondDepartmentName());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment