|
@@ -204,7 +204,7 @@ 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())&&trialNumberRule.getRule()==6){
|
|
|
+ if(!Objects.equals(rule.getId(), trialNumberRule.getId())&&trialNumberRule.getRule()==6&&rule.getRule()==6){
|
|
|
throw new ServiceException("已存在流水号规则");
|
|
|
}
|
|
|
}
|