试验编号bug

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

@@ -101,7 +101,7 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                             return "";
                         }
                     });
-                    trialNumber.append(result);
+                    trialNumber.append(result==null?"":result);
                 }else {
                     trialNumber.append("TJ01");
                 }
@@ -127,6 +127,10 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                 String currentMonthStr = String.format("%02d", currentMonthValue);
                 trialNumber.append(currentMonthStr);
             } else if (rule.getRule()==6) {
+                if(!isSaveRedis){
+                    trialNumber.append(rule.getData());
+                    break;
+                }
                 if(rule.getIsAutoIncrement()!=null&&rule.getIsAutoIncrement()==1){
                     String autoIncrementNumber="";
                     //如果是需要自增的 先要查出当前数据库中自增编号的最大值