|
|
@@ -27,7 +27,7 @@
|
|
|
FROM CONTRACT_INVOICE_RELATION WHERE ISVALID = 1
|
|
|
GROUP BY CONTRACT_ID
|
|
|
) PA on PA.CONTRACT_ID = c.ID
|
|
|
- <if test="params != null and params.deptId != null and params.deptId != ''">
|
|
|
+ <if test="params != null and params.deptIds != null and params.deptIds.size > 0">
|
|
|
LEFT JOIN PROJECT pr ON pr.ID = c.PROJECT_ID
|
|
|
</if>
|
|
|
<where>
|
|
|
@@ -95,7 +95,7 @@
|
|
|
AND c.AREA_MANAGER_ID = #{params.managerId}
|
|
|
</if>
|
|
|
<if test="params != null and params.deptIds != null and params.deptIds.size > 0">
|
|
|
- AND PR.ZRBM_ID in
|
|
|
+ AND pr.ZRBM_ID in
|
|
|
<foreach collection="params.deptIds" item="item" open="(" close=")" separator=",">
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
@@ -207,7 +207,7 @@
|
|
|
FROM CONTRACT_INVOICE_RELATION WHERE ISVALID = 1
|
|
|
GROUP BY CONTRACT_ID
|
|
|
) PA on PA.CONTRACT_ID = c.ID
|
|
|
- <if test="params != null and params.deptId != null and params.deptId != ''">
|
|
|
+ <if test="params != null and params.deptIds != null and params.deptIds.size > 0">
|
|
|
RIGHT JOIN PROJECT pr ON pr.ID = c.PROJECT_ID
|
|
|
</if>
|
|
|
<where>
|
|
|
@@ -275,7 +275,7 @@
|
|
|
AND c.AREA_MANAGER_ID = #{params.managerId}
|
|
|
</if>
|
|
|
<if test="params != null and params.deptIds != null and params.deptIds.size > 0">
|
|
|
- AND PR.ZRBM_ID in
|
|
|
+ AND pr.ZRBM_ID in
|
|
|
<foreach collection="params.deptIds" item="item" open="(" close=")" separator=",">
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
@@ -433,7 +433,7 @@
|
|
|
AND c.AREA_MANAGER_ID = #{params.managerId}
|
|
|
</if>
|
|
|
<if test="params != null and params.deptIds != null and params.deptIds.size > 0">
|
|
|
- AND PR.ZRBM_ID in
|
|
|
+ AND pr.ZRBM_ID in
|
|
|
<foreach collection="params.deptIds" item="item" open="(" close=")" separator=",">
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
@@ -523,7 +523,7 @@
|
|
|
AND c.AREA_MANAGER_ID = #{params.managerId}
|
|
|
</if>
|
|
|
<if test="params != null and params.deptIds != null and params.deptIds.size > 0">
|
|
|
- AND PR.ZRBM_ID in
|
|
|
+ AND pr.ZRBM_ID in
|
|
|
<foreach collection="params.deptIds" item="item" open="(" close=")" separator=",">
|
|
|
#{item}
|
|
|
</foreach>
|
ljy121