diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemTimeoutDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemTimeoutDao.xml index 7e5d2b71c..5f4cfb086 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemTimeoutDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemTimeoutDao.xml @@ -67,7 +67,7 @@ WHERE a.DEL_FLAG = '0' - AND a.ITEM_STATE = #{itemState} + AND item.ITEM_STATE = #{itemState} AND a.ITEM_STATE in (0,10) @@ -75,22 +75,22 @@ AND a.ITEM_CONTENT like concat('%', trim(#{keyword}), '%') - - - - - - - - - - - - - - - - + AND a.ID IN ( + SELECT + temp.ITEM_ID + FROM + ( SELECT dept.ITEM_ID FROM epdc_item_dept dept WHERE dept.DEL_FLAG = '0' + + AND dept.DEPT_ID IN + + #{deptId} + + + + AND dept.DEPT_ID = #{districtDeptId} + + ) temp + ) AND DATE_FORMAT( a.ITEM_CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}