|
|
|
@ -525,7 +525,7 @@ |
|
|
|
where b.ITEM_ID = ITEM_ID |
|
|
|
and DEL_FLAG = '0' |
|
|
|
) |
|
|
|
and (b.HANDLER_DEPT != '网格化平台' or (b.HANDLER_DEPT = '网格化平台' and b.STATE in (1060,1065))) |
|
|
|
and b.HANDLER_DEPT != '网格化平台' |
|
|
|
) process on process.ITEM_ID = item.ID |
|
|
|
WHERE item.DEL_FLAG = '0' |
|
|
|
and (item.IS_PEOPLE = '0' or (item.IS_PEOPLE = '1' and item.PEOPLE_FLAG = '0')) |
|
|
|
@ -633,8 +633,7 @@ |
|
|
|
) process on process.ITEM_ID = item.ID |
|
|
|
WHERE item.DEL_FLAG = '0' |
|
|
|
and (item.IS_PEOPLE = '0' or (item.IS_PEOPLE = '1' and item.PEOPLE_FLAG = '0')) |
|
|
|
and (process.state is not null and process.state not in (11,15)) |
|
|
|
and process.state = 14 |
|
|
|
and (process.state is not null and process.state in (14,1060,1065)) |
|
|
|
<if test="peopleFlag != null and peopleFlag != ''"> |
|
|
|
AND item.PEOPLE_FLAG = #{peopleFlag} |
|
|
|
</if> |
|
|
|
|