试验编号bug

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

@@ -135,7 +135,7 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                     String autoIncrementNumber="";
                     //如果是需要自增的 先要查出当前数据库中自增编号的最大值
 
-                    String sql3 = "SELECT auto_increment_number FROM u_trial_auto_number where type="+type+" and is_deleted=0 ORDER BY auto_increment_number DESC LIMIT 1";
+                    String sql3 = "SELECT auto_increment_number FROM u_trial_auto_number where type="+type+" and contract_id="+contractId+" and is_deleted=0 ORDER BY auto_increment_number DESC LIMIT 1";
                     String maxNumber = jdbcTemplate.query(sql3, rs -> {
                         if (rs.next()) {
                             return rs.getObject(1, String.class);
@@ -143,7 +143,7 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                             return rule.getData();
                         }
                     });
-                    String sql4="select auto_increment_number FROM u_trial_auto_number where type="+type+" and is_deleted=0  ORDER BY auto_increment_number ASC";
+                    String sql4="select auto_increment_number FROM u_trial_auto_number where type="+type+" and contract_id="+contractId+" and is_deleted=0  ORDER BY auto_increment_number ASC";
                     List<String> autoNumbers = jdbcTemplate.query(sql4, new SingleColumnRowMapper<>(String.class));
                     //判断自增的流水号是否是连续的 是连续的就在最大值加1，不是连续的先使用缺失的编号
                     List<String> missingNumbers = findMissingNumberPatterns(autoNumbers);