fix

cost-service/src/main/java/com/blt/other/module/cost/model/CostTemplate.java

@@ -122,11 +122,9 @@ public class CostTemplate implements Serializable {
         //括号里面的是代表不需要自动审核的，太拗口了
         //部门设置的自动审核金额大于0 且 当前金额小于部门设置的自动审核金额，也就是不需要自动审核，加个 ！ 就是需要自动审核的
         //departmentMinimumReviewAmount.compareTo(BigDecimal.ZERO) > 0 && amount.compareTo(departmentMinimumReviewAmount) < 0
-        // cost.getCostForm() == 1 付款单
         ///
    return !(departmentMinimumReviewAmount.compareTo(BigDecimal.ZERO) > 0 &&
-                amount.compareTo(departmentMinimumReviewAmount) < 0 &&
-                cost.getCostForm() == 1);
+                amount.compareTo(departmentMinimumReviewAmount) < 0);
     }
 
     public boolean shouldHrCheck(CostDomain costDomain) {

cost-service/src/main/java/com/blt/other/module/cost/service/impl/costcheck/DepartmentCheckState.java

@@ -80,7 +80,8 @@ public class DepartmentCheckState extends CostState {
 
         //如果不需要审核 直接通过
         DepartmentReviewer departmentReviewer = this.getCurrentDepartmentReviewer(oaDepartment.getDepartmentId());
-        if (!costTemplate.shouldDepartmentCheck(costDomain, departmentReviewer.getAutoReviewAmount())) {
+        //收款单也不需要审核
+        if (costDomain.getCostForm() == 2 || (!costTemplate.shouldDepartmentCheck(costDomain, departmentReviewer.getAutoReviewAmount()))) {
 
             costDomain.setCostStatus(CostDomain.STATUS_HR_CHECK);
             costDomain.setLastModifyDate(LocalDateTime.now());