fix

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

@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
  */
 @Component
 @Scope("prototype")
-public class GeneralManagerCheckState extends CostState{
+public class GeneralManagerCheckState extends CostState {
 
     @Resource
     UnPayState unPayState;
@@ -54,7 +54,7 @@ public class GeneralManagerCheckState extends CostState{
             throw new BizRuntimeException("invalid status");
         }
         //小于1w的自动审核
-        if(this.autoPass(costDomain)){
+        if (this.autoPass(costDomain)) {
             //自动审核通过
             if (this.autoCheck(costDomain)) {
                 costDomain.setCostStatus(CostDomain.STATUS_UN_PAY);
@@ -74,12 +74,9 @@ public class GeneralManagerCheckState extends CostState{
                 return;
             }
         }
-        if(currentUserId != null) {
+        if (currentUserId != null) {
             //目前限定铭哥能审核
-            if (currentUserId != 681) {
-                throw new BizRuntimeException("current user no authority");
-            }
-
+            if (currentUserId == 681 || currentUserId == 2346) {
                 //大于等于1w需要铭哥审批
                 if (costDomain.getAmountRmb().compareTo(new BigDecimal("10000")) >= 0) {
                     costDomain.setCostStatus(CostDomain.STATUS_UN_PAY);
@@ -98,6 +95,9 @@ public class GeneralManagerCheckState extends CostState{
                     costContext.costService.toFinancial(costDomain);
                     return;
                 }
+            } else {
+                throw new BizRuntimeException("current user no authority");
+            }
         }
     }
 
@@ -114,9 +114,7 @@ public class GeneralManagerCheckState extends CostState{
         }
 
         //人工审核通过
-        if (currentUserId != 681) {
-            throw new BizRuntimeException("current user no authority");
-        }
+        if (currentUserId == 681 || currentUserId == 2346) {
             ApprovalHistoryDomain approvalHistoryDomain = ApprovalHistoryDomain.builder()
                     .approvalUserId(currentUserId)
                     .approvalTime(LocalDateTime.now())
@@ -127,6 +125,9 @@ public class GeneralManagerCheckState extends CostState{
             approvalHistoryService.save(approvalHistoryDomain);
             costContext.costService.reject(costDomain.getCostNo());
             costLogService.save(costDomain.getCostNo(), currentUserId, "总经办审核拒绝,理由:" + rejectReason, CostLogDomain.TYPE_UPDATE);
+        } else {
+            throw new BizRuntimeException("current user no authority");
+        }
     }
 
     @Override
@@ -146,16 +147,16 @@ public class GeneralManagerCheckState extends CostState{
 
     }
 
-    private boolean autoPass(CostDomain costDomain){
-        if(costDomain.getAmountRmb().compareTo(new BigDecimal("10000")) < 0){
+    private boolean autoPass(CostDomain costDomain) {
+        if (costDomain.getAmountRmb().compareTo(new BigDecimal("10000")) < 0) {
             return true;
         }
-        if(costDomain.getCostForm().equals(2)){
+        if (costDomain.getCostForm().equals(2)) {
             //收款不需要审核
             return true;
         }
         CostTypeDomain costTypeDomain = costTypeDao.selectByNo(costDomain.getTypeNo());
-        if(costTypeDomain.getTypeName().contains("工资") || costTypeDomain.getTypeName().contains("物流")){
+        if (costTypeDomain.getTypeName().contains("工资") || costTypeDomain.getTypeName().contains("物流")) {
             return true;
         }
         return false;