Merge branch 'test-merge' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialNumberRuleServiceImpl.java

@@ -92,6 +92,11 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
         boolean flag=true;
         boolean flag1=true;
         int i=1;
+        if(rules.isEmpty()){
+            map.put("trialNumber","");
+            map.put("autoIncrementNumber","");
+            return map;
+        }
         do {
             for (TrialNumberRule rule : rules) {
                 if(rule.getRule()==1){
@@ -140,6 +145,7 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                     if(!isSaveRedis){
                         trialNumber.append(rule.getData());
                         map.put("autoIncrementNumber",rule.getData());
+                        continue;
                     }
                     if(rule.getIsAutoIncrement()!=null&&rule.getIsAutoIncrement()==1){
                         String autoIncrementNumber="";
@@ -206,7 +212,7 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                     }
                 }
             }
-            if(isSaveRedis){
+            if(isSaveRedis&&rules.stream().anyMatch(r->r.getRule()==6&&r.getIsAutoIncrement()==1)){
                     flag=checkTrialNumberIsExist(trialNumber.toString(),type,contractId);
                     i++;
                     if(!flag){