From a35a7879d399383bfe05e782d36bcf7673bc0c3d Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 10 Jul 2020 14:18:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=BE=A4?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/controller/GroupController.java     |  6 ++---
 .../group/service/impl/GroupServiceImpl.java  |  4 ----
 .../resources/mapper/smile/group/GroupDao.xml | 22 ++++++++-----------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/controller/GroupController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/controller/GroupController.java
index 2e5d068..335d27d 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/controller/GroupController.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/controller/GroupController.java
@@ -18,8 +18,8 @@
 package com.elink.esua.epdc.modules.smile.group.controller;
 
 import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
@@ -27,9 +27,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.smile.dto.group.*;
 import com.elink.esua.epdc.modules.smile.group.excel.GroupExcel;
 import com.elink.esua.epdc.modules.smile.group.service.GroupService;
+import com.elink.esua.epdc.smile.dto.group.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -202,8 +202,8 @@ public class GroupController {
      * @since 2019/11/12 9:30
      */
     @GetMapping("groupList")
+    @DataFilter(userId = FieldConstant.CREATED_BY)
     public Result<List<GroupListDTO>> groupList(GroupDTO dto) {
-        dto.setDeptId(SecurityUser.getDeptId());
         List<GroupListDTO> data = groupService.listOfGroupByGridId(dto);
         return new Result<List<GroupListDTO>>().ok(data);
     }
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java
index b52ad9c..e936791 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java
@@ -419,10 +419,6 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
 
     @Override
     public List<GroupListDTO> listOfGroupByGridId(GroupDTO dto) {
-        // 获取组织结构冗余信息
-        Result<DeptLevelAndLeaderDTO> parentAndAllDeptDTOResult = adminFeignClient.getDeptlevelById(dto.getDeptId());
-        DeptLevelAndLeaderDTO parentAndAllDeptDTO = parentAndAllDeptDTOResult.getData();
-        dto.setDeptList(parentAndAllDeptDTO.getAllDeptIds().split(","));
         return baseDao.selectListOfGroupByGridId(dto);
     }
 
diff --git a/epdc-cloud-property/src/main/resources/mapper/smile/group/GroupDao.xml b/epdc-cloud-property/src/main/resources/mapper/smile/group/GroupDao.xml
index 6f8be80..3f593a3 100644
--- a/epdc-cloud-property/src/main/resources/mapper/smile/group/GroupDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/smile/group/GroupDao.xml
@@ -301,27 +301,23 @@ ORDER BY
 
     <select id="selectListOfGroupByGridId" resultType="com.elink.esua.epdc.smile.dto.group.GroupListDTO">
         SELECT
-            ID AS groupId,
-            GROUP_NAME AS groupName
+        g.ID AS groupId,
+        g.GROUP_NAME AS groupName
         FROM
-            epdc_group
+            epdc_group g
         WHERE
-            DEL_FLAG = '0'
-        AND STATE IN ( 10, 15, 20 )
+            g.DEL_FLAG = '0'
+        AND g.STATE IN ( 10, 15, 20 )
         <if test="sectionCode != null and sectionCode != ''">
-            AND SECTION_CODE = #{sectionCode}
+            AND g.SECTION_CODE = #{sectionCode}
         </if>
         <if test="categoryCode != null and categoryCode != ''">
-            AND CATEGORY_CODE = #{categoryCode}
+            AND g.CATEGORY_CODE = #{categoryCode}
         </if>
         <if test="typeKey != null and typeKey != ''">
-            AND TYPE_KEY = #{typeKey}
+            AND g.TYPE_KEY = #{typeKey}
         </if>
-        AND (find_in_set(#{deptId},ALL_DEPT_IDS)
-        OR DEPT_ID IN
-        <foreach item="dept" collection="deptList" open="(" separator="," close=")">
-            #{dept}
-        </foreach>)
+        ORDER BY g.CREATED_TIME DESC
     </select>
 
     <select id="selectListOfGroupByDeptId" resultType="com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO">