From dc5b60fcf0cf097c5b695b15b7784fb4187d98b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Tue, 4 Aug 2020 13:45:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/controller/UserController.java | 10 ++++++++--
 .../elink/esua/epdc/service/impl/UserServiceImpl.java  |  5 +++++
 .../src/main/resources/mapper/UserDao.xml              |  6 ++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
index e29da6fb..eb9a2081 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
@@ -310,9 +310,15 @@ public class UserController {
 
 
 
-
+    /***
+     * 网格积分排名
+     * @param params 
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.UserPointResultDTO>>
+     * @author qushutong
+     * @date 2020/8/4 13:44
+     */
     @GetMapping("pointPage")
-    @DataFilter(tableAlias = "ug3", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND")
+//    @DataFilter(tableAlias = "ug3", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND")
     public Result<PageData<UserPointResultDTO>> pointPage(@RequestParam Map<String, Object> params) {
         PageData<UserPointResultDTO> page = userService.listPoint(params);
         return new Result<PageData<UserPointResultDTO>>().ok(page);
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index e88a24ec..8e13ac09 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -1348,6 +1348,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     @Override
     public PageData<UserPointResultDTO> listPoint(Map<String, Object> params) {
+        Long userId = SecurityUser.getUserId();
+        // 查询当前用户所具有的的数据权限
+        UserDetail userDetail = userDetailRedis.get(userId);
+        List<Long> deptIdList = userDetail.getDeptIdList();
+        params.put("deptIdList",deptIdList);
         IPage<UserPointResultDTO> iPage = this.getPage(params);
         List<UserPointResultDTO> userPointResultDTOS = baseDao.selectListPoints(params);
         return new PageData<>(userPointResultDTOS, iPage.getTotal());
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index 8ad88f51..6e0f87b6 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -912,6 +912,12 @@
         ) t0
         LEFT JOIN ( select * from (select * from epdc_user_grid_relation order by CREATED_TIME)t group by t.USER_ID) ug3 ON t0.ID = ug3.USER_ID
         where ug3.DEL_FLAG = '0'
+        <if test="deptIdList!=null and  deptIdList.size()>0">
+            and ug3.GRID_ID  IN
+            <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
+                #{deptIdItem}
+            </foreach>
+        </if>
         GROUP BY
         <choose>
             <when test='type != "" and type != null and type=="1"'>