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

Merge remote-tracking branch 'origin/20240913' into 24年9月安全问题

Browse Source
This commit is contained in:
梁琦涛
2024-09-14 17:44:42 +08:00
parent 636555ff3e 5df6b96be0
commit 205473efff
35 changed files with 100328 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+28 -6
View File
@@ -135,7 +135,9 @@ public class SysDictItemController {
if(!CollectionUtils.isEmpty(listSub)){
sysDictItem.setChildren(listSub);
}
listAll.add(sysDictItem);
if(!listAll.contains(sysDictItem)){
listAll.add(sysDictItem);
}
}
}
return listAll;
@@ -221,7 +223,7 @@ public class SysDictItemController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
queryWrapper.select("del_flag","description","dict_id","en_name","id","is_read_only","is_tag_dict","item_text",
"item_value","item_text as name","parent_id as pId","parent_id","sort_order","status");
"item_value","item_text as name","parent_id as pId","parent_id","sort_order","status","en_base");
List<SysDictItem> listSysDictItem = sysDictItemService.list(queryWrapper);
List<SysDictItem> listAll = new ArrayList<>();
// 树形查询手动封装分页
@@ -232,11 +234,25 @@ public class SysDictItemController {
listSelectAll.add(dictItem);
List<SysDictItem> sub = getParentData(dictItem.getParentId());
if(!CollectionUtils.isEmpty(sub)){
listSelectAll.addAll(sub);
for (SysDictItem item : sub) {
if(!listSelectAll.contains(item)){
listSelectAll.add(item);
}
}
}
}
listSysDictItem = new ArrayList<>();
if(!CollectionUtils.isEmpty(listSelectAll)){
listSysDictItem = listSelectAll.stream().distinct().collect(Collectors.toList());
for (SysDictItem dictItem : listSelectAll) {
if(!CollectionUtils.isEmpty(listSysDictItem)){
long l = listSysDictItem.stream().filter(o->Objects.equals(o.getId(),dictItem.getId())).count();
if(l == 0){
listSysDictItem.add(dictItem);
}
}else{
listSysDictItem.add(dictItem);
}
}
}
}
List<SysDictItem> listSysDictItemParent = listSysDictItem.stream().filter(o->Objects.equals(o.getParentId(),"0")).collect(Collectors.toList());
@@ -245,7 +261,9 @@ public class SysDictItemController {
if(!CollectionUtils.isEmpty(listRes)){
dictItem.setChildren(listRes);
}
listAll.add(dictItem);
if(!listAll.contains(dictItem)){
listAll.add(dictItem);
}
}
}
@@ -264,7 +282,11 @@ public class SysDictItemController {
&& !Objects.equals(dictItemChildren.getParentId(),"0")){
List<SysDictItem> sub = getParentData(dictItemChildren.getParentId());
if(!CollectionUtils.isEmpty(sub)){
listSelectAll.addAll(sub);
for (SysDictItem item : sub) {
if(!listSelectAll.contains(item)){
listSelectAll.add(item);
}
}
}
}
}