From 1ba714c0fe81663f337dd3f6423748596608dd8e Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Thu, 16 Jul 2020 11:34:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=92=E5=B1=9E=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A0=91bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 ++-- power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml | 2 +- .../main/java/com/manage/service/ipml/PowerServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1cdb3d4..d3172cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -target/ -.idea/ +/target/ +/.idea/ *.iml \ No newline at end of file diff --git a/power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml b/power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml index af8d253..ae11d6d 100644 --- a/power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml +++ b/power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml @@ -357,7 +357,7 @@ dict.dict_area FROM power_sys_dict dict - LEFT JOIN power_dept dept ON dict.dept_id = dept.dict_id + LEFT JOIN power_dept dept ON dict.dict_id = dept.dict_id AND dict.dict_status = 1 AND dept.effective = 1 diff --git a/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java index 279f40d..9cb4c0c 100644 --- a/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java @@ -1027,7 +1027,7 @@ public class PowerServiceImpl implements PowerService { tree1.setName(hospitalNameSet.get(hosKey)); treeList.add(tree1); for (int i = 0; i < dicts.size(); i++) { - if(dicts.get(i).getParentId().equals(hosKey)){ + if(dicts.get(i).getDictId().equals(hosKey)){ String deptName = dicts.get(i).getDeptName(); if(StringUtils.isNoneBlank(deptName)){ deptNameSet.put(dicts.get(i).getDeptId(),dicts.get(i).getDeptName());