QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
梁琦涛
2024-09-27 17:17:33 +08:00
parent c67c25ab65 5fa0acdc1e
commit 5bf6837b4b
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+11 -11
View File
@@ -3191,7 +3191,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
errorMsg += fieldName + " " + v + "Not exist;"; errorMsg += fieldName + " " + v + "Not exist;";
} }
countError++; countError++;
valueList = Collections.emptyList(); valueList = new ArrayList<>();
break; break;
} }
} }
@@ -3202,7 +3202,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
errorMsg += fieldName + " " + v + "Not exist;"; errorMsg += fieldName + " " + v + "Not exist;";
} }
countError++; countError++;
valueList = Collections.emptyList(); valueList = new ArrayList<>();
break; break;
} }
String cellValue = this.convertMultiOrgId(v, departMap, departPartMap); String cellValue = this.convertMultiOrgId(v, departMap, departPartMap);
@@ -3213,7 +3213,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
errorMsg += fieldName + " " + v + "Not exist;"; errorMsg += fieldName + " " + v + "Not exist;";
} }
countError++; countError++;
valueList = Collections.emptyList(); valueList = new ArrayList<>();
break; break;
} }
valueList.add(cellValue); valueList.add(cellValue);
@@ -3226,7 +3226,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
// errorMsg += fieldName + " " + v + "Not exist;"; // errorMsg += fieldName + " " + v + "Not exist;";
// } // }
// countError++; // countError++;
// valueList = Collections.emptyList(); // valueList = new ArrayList<>();
// break; // break;
// }else { // }else {
// valueList.add(first.get().getId()); // valueList.add(first.get().getId());
@@ -3268,7 +3268,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
errorMsg += fieldName + "中" + treePath + "存在多个；"; errorMsg += fieldName + "中" + treePath + "存在多个；";
countError++; countError++;
valueList = Collections.emptyList(); valueList = new ArrayList<>();
} else { } else {
errorMsg += fieldName + " " + treePath + "Exist in multiple;"; errorMsg += fieldName + " " + treePath + "Exist in multiple;";
} }
@@ -3282,7 +3282,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
errorMsg += fieldName + "中" + treePath + "存在多个；"; errorMsg += fieldName + "中" + treePath + "存在多个；";
countError++; countError++;
valueList = Collections.emptyList(); valueList = new ArrayList<>();
} else { } else {
errorMsg += fieldName + " " + treePath + "Not exist;"; errorMsg += fieldName + " " + treePath + "Not exist;";
} }
@@ -3303,7 +3303,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
errorMsg += fieldName + "中" + treePath + "存在多个；"; errorMsg += fieldName + "中" + treePath + "存在多个；";
countError++; countError++;
valueList = Collections.emptyList(); valueList = new ArrayList<>();
} else { } else {
errorMsg += fieldName + " " + treePath + "Exist in multiple;"; errorMsg += fieldName + " " + treePath + "Exist in multiple;";
} }
@@ -3317,7 +3317,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
errorMsg += fieldName + "中" + treePath + "不存在；"; errorMsg += fieldName + "中" + treePath + "不存在；";
countError++; countError++;
valueList = Collections.emptyList(); valueList = new ArrayList<>();
} else { } else {
errorMsg += fieldName + " " + treePath + "Not exist;"; errorMsg += fieldName + " " + treePath + "Not exist;";
} }
@@ -3340,7 +3340,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
errorMsg += fieldName + "中" + treePath + "存在多个；"; errorMsg += fieldName + "中" + treePath + "存在多个；";
countError++; countError++;
valueList = Collections.emptyList(); valueList = new ArrayList<>();
} else { } else {
errorMsg += fieldName + " " + treePath + "Exist in multiple;"; errorMsg += fieldName + " " + treePath + "Exist in multiple;";
} }
@@ -3351,7 +3351,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
errorMsg += fieldName + "中" + treePath + "不存在；"; errorMsg += fieldName + "中" + treePath + "不存在；";
countError++; countError++;
valueList = Collections.emptyList(); valueList = new ArrayList<>();
} else { } else {
errorMsg += fieldName + " " + treePath + "Not exist;"; errorMsg += fieldName + " " + treePath + "Not exist;";
} }
@@ -3646,7 +3646,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
List<SarFileSplitMenuTreeNode> treeNodeList = new ArrayList<>(); List<SarFileSplitMenuTreeNode> treeNodeList = new ArrayList<>();
String regex = "^[0-9]{0}([0-9]|[.])+$"; //TODO 待优化：数字和点必须交替 String regex = "^[0-9]{0}([0-9]|[.])+$"; //TODO 待优化：数字和点必须交替
String parentId = ""; String parentId = menuId;
for (Map<String, Object> itemEO : addItemsEOList) { for (Map<String, Object> itemEO : addItemsEOList) {
String itemNum = itemEO.get("item_num").toString().trim(); String itemNum = itemEO.get("item_num").toString().trim();
String itemTitle = itemEO.get("item_title").toString(); String itemTitle = itemEO.get("item_title").toString();