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 be8962b5..2990c3af 100644 --- 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 @@ -152,25 +152,40 @@ LEFT JOIN epdc_item_handle_process hp ON item.ID = hp.ITEM_ID AND hp.DEL_FLAG = '0' AND hp.CREATED_TIME = ( SELECT MAX( a.CREATED_TIME ) FROM epdc_item_handle_process a WHERE a.DEL_FLAG = '0' AND a.ITEM_ID = hp.ITEM_ID ) - LEFT JOIN epdc_item_dept dept ON item.Id = dept.ITEM_ID AND dept.DEL_FLAG = '0' WHERE - item.DEL_FLAG = '0' - - #{formDto.timestamp} - - AND dept.DEPT_ID IN + item.ID IN ( + SELECT + tmp.ITEM_ID + FROM + ( + SELECT DISTINCT + d.ITEM_ID + FROM + epdc_item_dept d + LEFT JOIN epdc_item it ON d.ITEM_ID = it.ID + WHERE + d.DEL_FLAG = '0' + AND it.DEL_FLAG = '0' + AND d.DEPT_ID IN #{deptIdItem} - - AND dept.DEPT_ID = #{formDto.deptId} + + #{formDto.timestamp} - AND item.ITEM_STATE = #{formDto.itemState} + AND it.ITEM_STATE = #{formDto.itemState} + + + AND d.DEPT_ID = #{formDto.deptId} ORDER BY - item.CREATED_TIME DESC + it.CREATED_TIME DESC LIMIT #{formDto.pageIndex},#{formDto.pageSize} + ) tmp + ) + ORDER BY + item.CREATED_TIME DESC