update

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 {
 
         //如果不需要审核 直接通过
         DepartmentReviewer departmentReviewer = this.getCurrentDepartmentReviewer(oaDepartment.getDepartmentId());
-        if (departmentReviewer != null && !costTemplate.shouldDepartmentCheck(costDomain, departmentReviewer.getAutoReviewAmount())) {
+        if (!costTemplate.shouldDepartmentCheck(costDomain, departmentReviewer.getAutoReviewAmount())) {
 
             costDomain.setCostStatus(CostDomain.STATUS_HR_CHECK);
             costDomain.setLastModifyDate(LocalDateTime.now());
@@ -177,7 +177,7 @@ public class DepartmentCheckState extends CostState {
         CostDomain costDomain = costContext.costDomain;
         DepartmentReviewer departmentReviewer = this.getCurrentDepartmentReviewer(departmentId);
 
-        if (departmentReviewer != null && departmentReviewer.getSecondDepartmentId() > 0) {
+        if (departmentReviewer.getSecondDepartmentId() > 0) {
             costLogService.save(costDomain.getCostNo(), 0, "匹配二级部门配置:" + departmentReviewer.getSecondDepartmentName());
         }
 

bailuntec-cost-core/src/main/resources/mapper/CostListSearchMapper.xml

@@ -46,7 +46,6 @@
         <if test=" params.keys.costForm!=null and params.keys.costForm != ''">and cost_form= #{params.keys.costForm}</if>
         <if test=" params.keys.companyNo!=null and params.keys.companyNo != ''">and company_no=#{params.keys.companyNo}</if>
         <if test=" params.keys.createUsercode!=null and params.keys.createUsercode != ''">and create_usercode=#{params.keys.createUsercode}</if>
-        <if test=" params.keys.kindNo!=null and params.keys.kindNo != ''">and kind_no=#{params.keys.kindNo}</if>
         <if test=" params.keys.costStatus!=null and params.keys.costStatus != '' and params.keys.costStatus != 10">and cost_status=#{params.keys.costStatus}</if>
         <if test=" params.keys.costStatus!=null and params.keys.costStatus != '' and params.keys.costStatus == 10">and cost_status=0</if>
         <if test=" params.keys.lendStatus!=null and params.keys.lendStatus != ''">and lend_status=#{params.keys.lendStatus}</if>

bailuntec-cost-core/src/test/java/com/blt/other/OtherApplicationTests.java

@@ -70,8 +70,6 @@ public class OtherApplicationTests {
     @Test
     public void syncDepartmentReviewer() {
         departmentReviewerMapper.delete(new LambdaQueryWrapper<>());
-//        costReviewerMapper.delete(new LambdaQueryWrapper<CostReviewer>()
-//                .eq(CostReviewer::getType, CostReviewer.departmentReviewer));
 
         List<CostReviewer> costReviewerList = costReviewerMapper.selectList(new LambdaQueryWrapper<CostReviewer>()
                 .eq(CostReviewer::getType, 1));