Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-order/src/main/resources/mapper/KwoWantBuyMapper.xml

@@ -57,11 +57,19 @@
 <!--                #{item,jdbcType=VARCHAR}-->
 <!--            </foreach>-->
             <!-- 使用 AND 条件 -->
-            and (
-            <foreach collection="wantBuyReq.tradings" item="item" separator=" and ">
-                kt.trading = #{item,jdbcType=VARCHAR}
+<!--            and (-->
+<!--            <foreach collection="wantBuyReq.tradings" item="item" separator=" and ">-->
+<!--                kt.trading = #{item,jdbcType=VARCHAR}-->
+<!--            </foreach>-->
+<!--            )-->
+            <foreach collection="wantBuyReq.tradings" item="value" separator="">
+                AND EXISTS (
+                SELECT 1
+                FROM kwo_want_buy_trading kt2
+                WHERE kt2.want_buy_id = kb.id
+                AND kt2.trading = #{value}
+                )
             </foreach>
-            )
         </if>
         <if test="wantBuyReq.wantBuyIds != null and wantBuyReq.wantBuyIds.size() > 0">
             and kb.id in