* 代码优化

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -45,8 +45,6 @@
             AND t.`status` > 0
             AND t4.`status` = 1
         <if test = "source == 'raiseChoose'">
-            AND ( t6.`status` != 0 OR t6.`status` IS NULL )
-            --AND (t.house_locking_status  != 'locked' OR t.house_locking_status IS NULL)
             AND t7.raise_start_time &lt;= now() AND t7.raise_end_time &gt;= now()
             <if test="personId != null and personId != ''">
                 AND (t6.person_id != #{personId} OR t6.person_id IS NULL)

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -172,12 +172,14 @@
             <if test = "bo.refundNo != null and bo.refundNo != ''">
                 AND t2.refund_no = #{bo.refundNo}
             </if>
-            <if test = "bo.payStatus == 'paid'">
-                AND t.pay_status = #{bo.payStatus}
-            </if>
-            <if test = "bo.payStatus == 'refunded'">
-                AND t.pay_status IN ('refunded','change')
-            </if>
+            <choose>
+                <when test="bo.payStatus == 'refunded'">
+                    AND t.pay_status IN ('refunded','change')
+                </when>
+                <otherwise>
+                    AND t.pay_status = #{bo.payStatus}
+                </otherwise>
+            </choose>
             <if test = "bo.payStartTime != null and bo.payStartTime != ''">
                 AND t2.pay_time &gt;= STR_TO_DATE(#{bo.payStartTime}, '%Y-%m-%d %H:%i:%s')
             </if>