|
@ -1164,7 +1164,7 @@ |
|
|
) process on process.ITEM_ID = item.ID |
|
|
) process on process.ITEM_ID = item.ID |
|
|
WHERE item.DEL_FLAG = '0' |
|
|
WHERE item.DEL_FLAG = '0' |
|
|
and (item.IS_PEOPLE = '0' or (item.IS_PEOPLE = '1' and item.PEOPLE_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 in (14,1060,1065)) |
|
|
and (process.state is not null and process.state in (14,1065)) |
|
|
<if test="peopleFlag != null and peopleFlag != ''"> |
|
|
<if test="peopleFlag != null and peopleFlag != ''"> |
|
|
AND item.PEOPLE_FLAG = #{peopleFlag} |
|
|
AND item.PEOPLE_FLAG = #{peopleFlag} |
|
|
</if> |
|
|
</if> |
|
@ -1267,7 +1267,7 @@ |
|
|
) process on process.ITEM_ID = item.ID |
|
|
) process on process.ITEM_ID = item.ID |
|
|
WHERE item.DEL_FLAG = '0' |
|
|
WHERE item.DEL_FLAG = '0' |
|
|
and (item.IS_PEOPLE = '0' or (item.IS_PEOPLE = '1' and item.PEOPLE_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 in (14,1060,1065)) |
|
|
and (process.state is not null and process.state in (14,1065)) |
|
|
<if test="peopleFlag != null and peopleFlag != ''"> |
|
|
<if test="peopleFlag != null and peopleFlag != ''"> |
|
|
AND item.PEOPLE_FLAG = #{peopleFlag} |
|
|
AND item.PEOPLE_FLAG = #{peopleFlag} |
|
|
</if> |
|
|
</if> |
|
|