试验编号需求优化

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialNumberRuleController.java

@@ -122,8 +122,8 @@ public class TrialNumberRuleController extends BladeController {
         List<TrialNumberRule> rules = trialNumberRuleMapper.selectList(Wrappers.<TrialNumberRule>query().lambda().eq(TrialNumberRule::getProjectId, trialNumberRule.getProjectId()).eq(TrialNumberRule::getContractId, trialNumberRule.getContractId()).eq(TrialNumberRule::getType, trialNumberRule.getType()));
         if(!rules.isEmpty()){
             for (TrialNumberRule rule : rules) {
-                if(Objects.equals(rule.getRule(), trialNumberRule.getRule())){
-                    throw new ServiceException("已存在相同的编号规则");
+                if(Objects.equals(rule.getRule(), trialNumberRule.getRule())&&trialNumberRule.getRule()==6){
+                    throw new ServiceException("已存在流水号规则");
                 }
             }
         }
@@ -160,8 +160,8 @@ public class TrialNumberRuleController extends BladeController {
         List<TrialNumberRule> rules = trialNumberRuleMapper.selectList(Wrappers.<TrialNumberRule>query().lambda().eq(TrialNumberRule::getProjectId, trialNumberRule.getProjectId()).eq(TrialNumberRule::getContractId, trialNumberRule.getContractId()).eq(TrialNumberRule::getType, trialNumberRule.getType()));
         if(!rules.isEmpty()){
             for (TrialNumberRule rule : rules) {
-                if(Objects.equals(rule.getRule(), trialNumberRule.getRule())&&!Objects.equals(rule.getId(), trialNumberRule.getId())){
-                    throw new ServiceException("已存在相同的编号规则");
+                if(Objects.equals(rule.getRule(), trialNumberRule.getRule())&&trialNumberRule.getRule()==6){
+                    throw new ServiceException("已存在流水号规则");
                 }
             }
         }