|
@@ -342,7 +342,7 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
|
|
if(list!=null&&list.size()>0){
|
|
if(list!=null&&list.size()>0){
|
|
List<TrialNumberRule> collect = list.stream().filter(o -> o.getRule() == 6 && o.getIsAutoIncrement() == 1).collect(Collectors.toList());
|
|
List<TrialNumberRule> collect = list.stream().filter(o -> o.getRule() == 6 && o.getIsAutoIncrement() == 1).collect(Collectors.toList());
|
|
if(!collect.isEmpty()){
|
|
if(!collect.isEmpty()){
|
|
- TrialAutoNumber one = trialAutoNumberService.getOne(Wrappers.lambdaQuery(TrialAutoNumber.class).eq(TrialAutoNumber::getFormDataId, formDataId).eq(TrialAutoNumber::getType, 4));
|
|
|
|
|
|
+ TrialAutoNumber one = trialAutoNumberService.getOne(Wrappers.lambdaQuery(TrialAutoNumber.class).eq(TrialAutoNumber::getFormDataId, formDataId).eq(TrialAutoNumber::getType, type));
|
|
if(one==null){
|
|
if(one==null){
|
|
TrialAutoNumber trialAutoNumber = new TrialAutoNumber();
|
|
TrialAutoNumber trialAutoNumber = new TrialAutoNumber();
|
|
trialAutoNumber.setId(SnowFlakeUtil.getId());
|
|
trialAutoNumber.setId(SnowFlakeUtil.getId());
|