From 10a5fee746da2a92c743c7b63dfa49419b117c83 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Sat, 17 Sep 2022 23:41:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-=E8=AF=89?=
 =?UTF-8?q?=E6=B1=82=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/modules/item/service/impl/ItemServiceImpl.java    | 7 +++++++
 .../src/main/resources/mapper/item/ItemDao.xml             | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index 1fe549825..4c0bd210d 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -2702,6 +2702,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
     @Override
     public PageData<ItemAppealPageResultDTO> getItemAppealPage(@RequestParam Map<String, Object> params) {
+        UserDetail user = SecurityUser.getUser();
+        //部门ID列表
+        List<Long> deptIdList = user.getDeptIdList();
+        params.put("deptIdList", null);
+        if (null != deptIdList && deptIdList.size() > 0) {
+            params.put("deptIdList", deptIdList);
+        }
         IPage<ItemAppealPageResultDTO> page = getPage(params);
         List<ItemAppealPageResultDTO> list = baseDao.getItemAppealPage(params);
         return new PageData<>(list, page.getTotal());
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index b30ee3f9a..646441d24 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -1469,6 +1469,12 @@
         <if test="appealType != null and appealType != ''">
             and i.PEOPLE_FLAG = #{appealType}
         </if>
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            AND i.GRID_ID IN
+            <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
+        </if>
         <if test="gridId != null and gridId != ''">
             AND (i.GRID_ID = #{gridId}
             OR find_in_set(#{gridId},i.ALL_DEPT_IDS))