Commit 124397e2 authored by chenhao's avatar chenhao

修改获取消防队伍中树信息展示没有数据的问题

parent a28664c7
...@@ -67,7 +67,7 @@ public class TreeParser { ...@@ -67,7 +67,7 @@ public class TreeParser {
parentId = PARENTIDMethodNameme.invoke(entity) != null ? Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity))) : null; parentId = PARENTIDMethodNameme.invoke(entity) != null ? Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity))) : null;
if (parentId == null || topId == parentId) { if (parentId == null || topId.equals(parentId) ) {//陈浩2021-12-01修改 topId == parentId 的判断
String codeString = String.valueOf(IDMethodNameme.invoke(entity)); String codeString = String.valueOf(IDMethodNameme.invoke(entity));
Integer num = 0; Integer num = 0;
if (list != null && list.size() > 0) { if (list != null && list.size() > 0) {
......
...@@ -468,7 +468,12 @@ public List<Menu> getFirstTeamToDesignatedDepartment(String dicCode, String type ...@@ -468,7 +468,12 @@ public List<Menu> getFirstTeamToDesignatedDepartment(String dicCode, String type
queryWrapper.eq(FireTeam::getTypeCode, code); queryWrapper.eq(FireTeam::getTypeCode, code);
queryWrapper.eq(FireTeam::getIsDelete, false); queryWrapper.eq(FireTeam::getIsDelete, false);
queryWrapper.eq(FireTeam::getCompanyName, "消防救援保障部"); queryWrapper.eq(FireTeam::getCompanyName, "消防救援保障部");
return TreeParser.getTree(null, this.baseMapper.selectList(queryWrapper), FireTeam.class.getName(), "getSequenceNbr", 2, "getName", "getParent", LambdaQueryWrapper<FireTeam> queryWrapper1 = new LambdaQueryWrapper<FireTeam>();
queryWrapper1.eq(FireTeam::getIsDelete, false);
queryWrapper1.eq(FireTeam::getCompanyName, "消防救援保障部");
queryWrapper1.isNull(FireTeam::getParent);
FireTeam parentFireTeam= this.baseMapper.selectOne(queryWrapper1);
return TreeParser.getTree(parentFireTeam.getSequenceNbr() , this.baseMapper.selectList(queryWrapper), FireTeam.class.getName(), "getSequenceNbr", 2, "getName", "getParent",
null); null);
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment