he2802 2 gadi atpakaļ
vecāks
revīzija
173650bead

+ 8 - 2
zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -288,6 +288,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN sys_tenant st ON too.tenant_id = st.tenant_id
         LEFT JOIN top_order_rec_note rn ON too.tenant_id = rn.tenant_id and too.order_sn = rn.order_sn
         where too.check_status=1 AND too.order_uncollected >0
+        <if test="tenantId != null and tenantId != ''">
+            AND too.tenant_id = #{tenantId}
+        </if>
         <if test="startTime != null and startTime != ''">
             AND too.buy_time <![CDATA[ >= ]]> #{startTime}
         </if>
@@ -295,7 +298,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND too.buy_time <![CDATA[ <= ]]> #{endTime}
         </if>
         <if test="keyNo != null and keyNo != ''">
-            AND (too.tenant_id like concat('%', #{keyNo}, '%') or too.create_no like concat('%', #{keyNo}, '%'))
+            AND (st.tenant_name like concat('%', #{keyNo}, '%') or too.create_no like concat('%', #{keyNo}, '%'))
         </if>
         <if test="creditStatus != null and creditStatus != ''">
             AND too.credit_status = #{creditStatus}
@@ -333,6 +336,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN sys_tenant st ON too.tenant_id = st.tenant_id
                 LEFT JOIN top_order_rec_note rn ON too.tenant_id = rn.tenant_id and too.order_sn = rn.order_sn
         where too.check_status=1 AND too.order_uncollected >0
+        <if test="tenantId != null and tenantId != ''">
+            AND too.tenant_id = #{tenantId}
+        </if>
         <if test="startTime != null and startTime != ''">
             AND too.buy_time <![CDATA[ >= ]]> #{startTime}
         </if>
@@ -340,7 +346,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND too.buy_time <![CDATA[ <= ]]> #{endTime}
         </if>
         <if test="keyNo != null and keyNo != ''">
-            AND (too.tenant_id like concat('%', #{keyNo}, '%') or too.create_no like concat('%', #{keyNo}, '%'))
+            AND (st.tenant_name like concat('%', #{keyNo}, '%') or too.create_no like concat('%', #{keyNo}, '%'))
         </if>
         <if test="creditStatus != null and creditStatus != ''">
             AND too.credit_status = #{creditStatus}