From 03a7238b84faf4f40b98a2adb100be2d2499682a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Thu, 21 Nov 2019 11:22:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/item/form/ItemInformationFormDTO.java    |  6 +++++-
 .../item/controller/WorkItemController.java      |  1 +
 .../resources/mapper/item/ItemInformationDao.xml | 16 +++++++++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemInformationFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemInformationFormDTO.java
index 811cd03a3..751e0fe50 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemInformationFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemInformationFormDTO.java
@@ -7,6 +7,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author LC
@@ -19,7 +20,6 @@ public class ItemInformationFormDTO implements Serializable {
     /**
      * 部门ID
      */
-    @NotNull(message = "用户网格ID不能为空")
     private Long deptId;
     /**
      * 页码，从1开始
@@ -36,4 +36,8 @@ public class ItemInformationFormDTO implements Serializable {
      */
     @NotBlank(message = "时间戳不能为空")
     private String timestamp;
+    /**
+     * 部门ID列表
+     */
+    List<Long> deptIdList;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java
index 017fd142e..6e17eff88 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java
@@ -72,6 +72,7 @@ public class WorkItemController {
      */
     @GetMapping("notice")
     public Result<List<ItemInformationResultDTO>> notice(@RequestBody ItemInformationFormDTO formDto) {
+        formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList());
         ValidatorUtils.validateEntity(formDto);
         return this.itemInformationService.notice(formDto);
     }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml
index e9ffc7c52..753021b95 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml
@@ -29,7 +29,13 @@
         WHERE
         information.DEL_FLAG = '0'
         AND  information.READ_FLAG = '1'
+        <if test="deptId != null">
         AND information.DEPT_ID = #{deptId}
+        </if>
+        AND information.DEPT_ID IN
+        <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
+            #{deptIdItem}
+        </foreach>
         <if test="timestamp != null">
             <![CDATA[ AND DATE_FORMAT(information.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
@@ -38,6 +44,14 @@
         LIMIT #{pageIndex},#{pageSize}
     </select>
     <update id="updateInformationReadFlag">
-        UPDATE epdc_item_information SET READ_FLAG = '1' WHERE DEPT_ID = #{deptId} AND DEL_FLAG = '0'
+        UPDATE epdc_item_information SET READ_FLAG = '1' WHERE
+        DEL_FLAG = '0'
+        <if test="deptId != null">
+            AND DEPT_ID = #{deptId}
+        </if>
+        AND DEPT_ID IN
+        <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
+            #{deptIdItem}
+        </foreach>
     </update>
 </mapper>