查找

assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml

@@ -93,10 +93,10 @@
             <if test="taskStatus != null and taskStatus != ''">
                 and task.TASK_STATUS = #{taskStatus}
             </if>
-            <if test="isReturn != null and isReturn == 0">
+            <if test="isReturn != null and isReturn !='' and isReturn == 0">
                 and cate.is_valid = 1 and task.task_status in (0,4,5)
             </if>
-            <if test="isReturn != null and isReturn == 1">
+            <if test="isReturn != null  and isReturn !='' and isReturn == 1">
                 and cate.is_valid = 0 or cate.is_valid is null
             </if>
         </where>

governance/src/main/resources/com/hungraim/ltc/governance/mapper/SrvSend.xml

@@ -44,8 +44,8 @@
     LEFT JOIN CH_APR_TASK t ON i.disab_info_id = t.DISABLE_INFO_ID
     <where>
       t.TASK_STATUS = 3
-      <if test="chSrvOrgan.srvOrganId != null and chSrvOrgan.srvOrganId != ''">
-        AND o.organ_id = #{chSrvOrgan.srvOrganId}
+      <if test="chSrvOrgan.organId != null and chSrvOrgan.organId != ''">
+        AND o.organ_id = #{chSrvOrgan.organId}
       </if>
 
       <if test="disableInfo.realName != null and disableInfo.realName != ''">
@@ -80,7 +80,7 @@
         AND s.srv_mode_id = #{chSrvSend.srvModeId}
       </if>
 
-      <if test="chSrvSend.status != null and chSrvSend.status != ''">
+      <if test="chSrvSend.status != null ">
         AND (s.status is not null and s.status = #{chSrvSend.status})
       </if>
     </where>