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 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> 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' + AND information.DEPT_ID = #{deptId} + + AND information.DEPT_ID IN + + #{deptIdItem} + #{timestamp} @@ -38,6 +44,14 @@ LIMIT #{pageIndex},#{pageSize} - 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' + + AND DEPT_ID = #{deptId} + + AND DEPT_ID IN + + #{deptIdItem} +