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 implem @Override public PageData getItemAppealPage(@RequestParam Map params) { + UserDetail user = SecurityUser.getUser(); + //部门ID列表 + List deptIdList = user.getDeptIdList(); + params.put("deptIdList", null); + if (null != deptIdList && deptIdList.size() > 0) { + params.put("deptIdList", deptIdList); + } IPage page = getPage(params); List 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 @@ and i.PEOPLE_FLAG = #{appealType} + + AND i.GRID_ID IN + + #{deptId} + + AND (i.GRID_ID = #{gridId} OR find_in_set(#{gridId},i.ALL_DEPT_IDS))