github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

解决oracle下，部门展示不出的问题

pull/63/head^2
zhangdaihao 2019-05-20 16:06:37 +08:00
parent 1e4bde0202
commit cdf6ec5082
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/FindsDepartsChildrenUtil.java
View File

@ -1,5 +1,6 @@
package org.jeecg.modules.system.util; package org.jeecg.modules.system.util;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.entity.SysDepart; import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.DepartIdModel;
import org.jeecg.modules.system.model.SysDepartTreeModel; import org.jeecg.modules.system.model.SysDepartTreeModel;
@ -31,7 +32,7 @@ public class FindsDepartsChildrenUtil {
List<SysDepartTreeModel> records = new ArrayList<>(); List<SysDepartTreeModel> records = new ArrayList<>();
for (int i = 0; i < recordList.size(); i++) { for (int i = 0; i < recordList.size(); i++) {
SysDepart depart = recordList.get(i); SysDepart depart = recordList.get(i);
records.add(new SysDepartTreeModel(recordList.get(i))); records.add(new SysDepartTreeModel(depart));
} }
List<SysDepartTreeModel> tree = findChildren(records, idList); List<SysDepartTreeModel> tree = findChildren(records, idList);
setEmptyChildrenAsNull(tree); setEmptyChildrenAsNull(tree);
@ -52,7 +53,7 @@ public class FindsDepartsChildrenUtil {
List<SysDepartTreeModel> treeList = new ArrayList<>(); List<SysDepartTreeModel> treeList = new ArrayList<>();
for (int i = 0; i < recordList.size(); i++) { for (int i = 0; i < recordList.size(); i++) {
SysDepartTreeModel branch = recordList.get(i); SysDepartTreeModel branch = recordList.get(i);
if ("".equals(branch.getParentId())) { if (oConvertUtils.isEmpty(branch.getParentId())) {
treeList.add(branch); treeList.add(branch);
DepartIdModel departIdModel = new DepartIdModel().convert(branch); DepartIdModel departIdModel = new DepartIdModel().convert(branch);
idList.add(departIdModel); idList.add(departIdModel);
@ -73,7 +74,7 @@ public class FindsDepartsChildrenUtil {
DepartIdModel idModel = idList.get(i); DepartIdModel idModel = idList.get(i);
for (int i1 = 0; i1 < recordList.size(); i1++) { for (int i1 = 0; i1 < recordList.size(); i1++) {
SysDepartTreeModel m = recordList.get(i1); SysDepartTreeModel m = recordList.get(i1);
if (m.getParentId().equals(model.getId())) { if (m.getParentId()!=null && m.getParentId().equals(model.getId())) {
model.getChildren().add(m); model.getChildren().add(m);
DepartIdModel dim = new DepartIdModel().convert(m); DepartIdModel dim = new DepartIdModel().convert(m);
idModel.getChildren().add(dim); idModel.getChildren().add(dim);