From 9c684c89298fbca4e72ea26f0bfa5b5583f12f98 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Fri, 31 Jan 2020 12:00:09 +0800
Subject: [PATCH] =?UTF-8?q?dao=E6=96=B0=E5=A2=9EselectListDeptTreeForEpiDe?=
 =?UTF-8?q?mic=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dao/SysDeptDao.java   |  6 +++--
 .../epdc/service/impl/SysDeptServiceImpl.java | 26 +++++--------------
 .../src/main/resources/mapper/SysDeptDao.xml  | 11 ++++++++
 3 files changed, 21 insertions(+), 22 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 e04766bba..38b7f3a57 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
@@ -8,6 +8,7 @@
 
 package com.elink.esua.epdc.dao;
 
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.DeptTreeDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
@@ -16,7 +17,6 @@ import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
-import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -153,5 +153,7 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      * @Description 查询未建立党员群的网格列表
      * @Date 2019/12/19 12:54
      **/
-	List<CompleteDeptDTO> selectListCompleteDeptDTO(Map<String, Object> params);
+    List<CompleteDeptDTO> selectListCompleteDeptDTO(Map<String, Object> params);
+
+    List<DeptTreeDTO> selectListDeptTreeForEpiDemic();
 }
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 2c1a83999..de54a8349 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
@@ -665,7 +665,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
      * @Date 2020/1/31 11:39
      **/
     private void packgeAllDeptOptionForEpiDemic() {
-        List<DeptTreeDTO> deptList = baseDao.selectListDeptTree();
+        List<DeptTreeDTO> deptList = baseDao.selectListDeptTreeForEpiDemic();
         JSONObject node;
         JSONArray headNodes = new JSONArray();
         for (DeptTreeDTO deptItemDto : deptList) {
@@ -693,25 +693,11 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
                 children = new JSONArray();
                 for (DeptTreeDTO categoryTreeDto : others) {
                     if (categoryTreeDto.getPid().equals(node.get("value"))) {
-                        SysDeptEntity parentDeptInfo = baseDao.getById(categoryTreeDto.getPid());
-                        //二级只要街道党工委
-                        if (parentDeptInfo.getPid().longValue() == NumConstant.ZERO_L) {
-                            logger.info("二级目录：" + categoryTreeDto.getName());
-                            SysDeptEntity currentDeptInfo = baseDao.getById(categoryTreeDto.getId());
-                            if (OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(currentDeptInfo.getTypeKey())) {
-                                childNode = new JSONObject();
-                                childNode.put("value", categoryTreeDto.getId());
-                                childNode.put("label", categoryTreeDto.getName());
-                                children.add(childNode);
-                                allChildren.add(childNode);
-                            }
-                        } else {
-                            childNode = new JSONObject();
-                            childNode.put("value", categoryTreeDto.getId());
-                            childNode.put("label", categoryTreeDto.getName());
-                            children.add(childNode);
-                            allChildren.add(childNode);
-                        }
+                        childNode = new JSONObject();
+                        childNode.put("value", categoryTreeDto.getId());
+                        childNode.put("label", categoryTreeDto.getName());
+                        children.add(childNode);
+                        allChildren.add(childNode);
                     }
                 }
                 if (!children.isEmpty()) {
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 b1dc71cc7..27e545402 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
@@ -202,6 +202,17 @@
             where sd.del_flag='0'
     </select>
 
+    <!--    -->
+    <select id="selectListDeptTreeForEpiDemic" resultType="com.elink.esua.epdc.dto.DeptTreeDTO">
+    SELECT
+        sd.id,
+        sd.pid,
+        sd.`name`
+    FROM
+        sys_dept sd
+        where sd.del_flag='0'
+        and sd.type_key in('street_party','community_party','grid_party','district_party')
+    </select>
     <!--  查询未建立党员群的网格列表   -->
     <select id="selectListCompleteDeptDTO" parameterType="map" resultType="com.elink.esua.epdc.dto.CompleteDeptDTO">
         SELECT