|
@@ -152,9 +152,8 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
|
|
|
return null;
|
|
|
}
|
|
|
});
|
|
|
- if(StringUtils.isEmpty(maxNumber)){
|
|
|
+ if(StringUtils.isEmpty(maxNumber)&&i==1){
|
|
|
autoIncrementNumber=rule.getData();
|
|
|
- flag1=false;
|
|
|
}else {
|
|
|
autoIncrementNumber=incrementFormattedNumberWithCheck(maxNumber,i);
|
|
|
}
|
|
@@ -205,13 +204,11 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
|
|
|
}
|
|
|
}
|
|
|
if(isSaveRedis){
|
|
|
- if(flag1){
|
|
|
flag=checkTrialNumberIsExist(trialNumber.toString(),type,contractId);
|
|
|
i++;
|
|
|
if(!flag){
|
|
|
trialNumber.setLength(0);
|
|
|
}
|
|
|
- }
|
|
|
}
|
|
|
}while (!flag);
|
|
|
map.put("trialNumber",trialNumber.toString());
|