From 81167d7fa6f6b23d3dac6c31e69c9a40db934119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Fri, 29 Nov 2019 13:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=8B=BC=E6=8E=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dao/SysDeptDao.java   | 10 +++++
 .../epdc/service/impl/SysDeptServiceImpl.java | 38 +++++++++++--------
 .../src/main/resources/mapper/SysDeptDao.xml  | 19 ++++++++++
 3 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
index 2f92fb044..5b9ea4e70 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
@@ -75,6 +75,16 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      */
     CompleteDeptDTO getCompleteDept(@Param("gridId") Long gridId);
 
+    /**
+     * 通过网格ID获取该网格所有上级机构
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.dto.CompleteDeptDTO
+     * @author yujintao
+     * @date 2019/9/7 09:20
+     */
+    CompleteDeptDTO getParentAndAllDept(@Param("gridId") Long deptId);
+
     /**
      * 通过街道ID获取项目可流转部门
      *
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index e6db05968..2510c8ffc 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -249,22 +249,30 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         if (null == deptId) {
             return new Result().error("参数格式异常");
         }
-        CompleteDeptDTO completeDept = this.baseDao.getCompleteDept(deptIdL);
+        CompleteDeptDTO completeDept = this.baseDao.getParentAndAllDept(deptIdL);
         ParentAndAllDeptDTO parentAndAllDeptDTO = new ParentAndAllDeptDTO();
-        parentAndAllDeptDTO.setGrid(completeDept.getGrid());
-        parentAndAllDeptDTO.setGridId(completeDept.getGridId());
-        // 父所有部门（包含街道、社区）
-        String deptNames = (StringUtils.isNotEmpty(completeDept.getStreet()) ? completeDept.getStreet() : "");
-        deptNames += (StringUtils.isNotEmpty(completeDept.getCommunity()) ? "-"+completeDept.getCommunity() : "");
-        String deptIds = (completeDept.getStreetId()!=null && completeDept.getStreetId()!= 0 ? completeDept.getStreetId().toString() : "");
-        deptIds += (completeDept.getCommunityId()!=null && completeDept.getCommunityId()!= 0 ? ","+completeDept.getCommunityId().toString() : "");
-        parentAndAllDeptDTO.setParentDeptIds(deptIds);
-        parentAndAllDeptDTO.setParentDeptNames(deptNames);
-        // 所有部门（包含街道、社区、网格）
-        deptNames += (StringUtils.isNotEmpty(completeDept.getGrid()) ? "-"+completeDept.getGrid() : "");
-        deptIds += (completeDept.getGridId()!=null && completeDept.getGridId()!= 0 ? ","+completeDept.getGridId().toString() : "");
-        parentAndAllDeptDTO.setAllDeptIds(deptIds);
-        parentAndAllDeptDTO.setAllDeptNames(deptNames);
+
+        if(completeDept != null){
+            parentAndAllDeptDTO.setGrid(StringUtils.isNotEmpty(completeDept.getGrid()) ? completeDept.getGrid() : "");
+            parentAndAllDeptDTO.setGridId(completeDept.getGridId()!=null && completeDept.getGridId()!= 0 ? completeDept.getGridId() : null);
+            // 父所有部门（包含街道、社区）
+            String deptNames = (StringUtils.isNotEmpty(completeDept.getDistrict()) ? completeDept.getDistrict() : "");
+            deptNames += (StringUtils.isNotEmpty(completeDept.getStreet()) ? "-"+completeDept.getStreet() : "");
+            deptNames += (StringUtils.isNotEmpty(completeDept.getCommunity()) ? "-"+completeDept.getCommunity() : "");
+            String deptIds = (completeDept.getDistrictId()!=null && completeDept.getDistrictId()!= 0 ? completeDept.getDistrictId().toString() : "");
+            deptIds += (completeDept.getStreetId()!=null && completeDept.getStreetId()!= 0 ? ","+ completeDept.getStreetId().toString() : "");
+            deptIds += (completeDept.getCommunityId()!=null && completeDept.getCommunityId()!= 0 ? ","+ completeDept.getCommunityId().toString() : "");
+            parentAndAllDeptDTO.setParentDeptIds(deptIds);
+            parentAndAllDeptDTO.setParentDeptNames(deptNames);
+            // 所有部门（包含街道、社区、网格）
+            deptNames += (StringUtils.isNotEmpty(completeDept.getGrid()) ? "-"+completeDept.getGrid() : "");
+            deptIds += (completeDept.getGridId()!=null && completeDept.getGridId()!= 0 ? ","+completeDept.getGridId().toString() : "");
+            parentAndAllDeptDTO.setAllDeptIds(deptIds);
+            parentAndAllDeptDTO.setAllDeptNames(deptNames);
+        } else {
+            return new Result().error("部门Id错误");
+        }
+
 
         return new Result().ok(parentAndAllDeptDTO);
     }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
index 50a821f34..5bf4177a1 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
@@ -65,6 +65,25 @@
             AND gri.del_flag = '0'
             AND dis.id IS NOT NULL
     </select>
+    <select id="getParentAndAllDept" resultType="com.elink.esua.epdc.dto.CompleteDeptDTO">
+        SELECT
+            dis.`name` district,
+            dis.id districtId,
+            str.`name` street,
+            str.id streetId,
+            com.`name` community,
+            com.id communityId,
+            gri.`name` grid,
+            gri.id gridId
+        FROM
+            sys_dept gri
+            LEFT JOIN sys_dept com ON gri.pid = com.id
+            LEFT JOIN sys_dept str ON com.pid = str.id
+            LEFT JOIN sys_dept dis ON str.pid = dis.id
+        WHERE
+            gri.ID = #{deptId}
+            AND gri.del_flag = '0'
+    </select>
 
     <select id="selectListOfItemCirculationDept" resultType="com.elink.esua.epdc.dto.SysDeptDTO">
         SELECT