submit

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -101,16 +101,24 @@
         LEFT JOIN business_user bu on bu.business_id = i.id
         LEFT JOIN sys_user u on u.user_id = f.user_id
         <where>
+            <if test="userId != null">
+                and bu.user_id = #{userId}
+            </if>
             <if test="projectType != null and projectType != ''">
                 and i.project_type in
                 <foreach collection="projectType" item="projectType" open="(" separator="," close=")">
                     #{projectType}
                 </foreach>
             </if>
-            <if test="minAmount != null and minAmount != '' and maxAmount != minAmount">
+            <if test="minAmount != null and minAmount != '' and minAmount != 0 and maxAmount != minAmount">
                 and i.investment_amount &gt;= #{minAmount}
             </if>
-            <if test="maxAmount != null and maxAmount != '' and maxAmount != minAmount">
+            <if test="minAmount == 0 and maxAmount != minAmount">
+                and ((i.investment_amount &gt;= #{minAmount}
+                and i.investment_amount &lt; #{maxAmount})
+                or i.investment_amount is null)
+            </if>
+            <if test="maxAmount != null and maxAmount != '' and maxAmount != minAmount and minAmount != 0">
                 and i.investment_amount &lt; #{maxAmount}
             </if>
             <if test="minAmount != null and minAmount != '' and maxAmount != null and maxAmount != '' and maxAmount == minAmount">
@@ -128,9 +136,6 @@
             <if test="ownerCompany != null and ownerCompany != ''">
                 or i.construction_unit like concat('%',#{ownerCompany},'%')
             </if>
-            <if test="userId != null">
-                and bu.user_id = #{userId}
-            </if>
             <if test="others != null">
                  and bu.user_id != #{others} and i.is_private = 1
             </if>