Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

This commit is contained in:
CD
2022-10-09 16:53:00 +08:00
@@ -752,14 +752,8 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
countError++; countError++;
} }
if(StringUtils.isEmpty(itemName)){ if(StringUtils.isNotEmpty(itemName)){
if(StringUtils.equals(cut,CutEnum.CN.getValue())){ if(itemName.length() > 100){
errorMsg += "条款名称不能为空;";
}else if (StringUtils.equals(cut,CutEnum.EN.getValue())){
errorMsg += "Item Name cannot be empty;";
}
countError++;
}else if(itemName.length() > 100){
if(StringUtils.equals(cut,CutEnum.CN.getValue())){ if(StringUtils.equals(cut,CutEnum.CN.getValue())){
errorMsg += "条款名称长度不能超过100;"; errorMsg += "条款名称长度不能超过100;";
}else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){
@@ -767,6 +761,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
} }
countError++; countError++;
} }
}
if(StringUtils.isEmpty(itemContent)){ if(StringUtils.isEmpty(itemContent)){
if(StringUtils.equals(cut,CutEnum.CN.getValue())){ if(StringUtils.equals(cut,CutEnum.CN.getValue())){