Merge remote-tracking branch 'origin/main'

2026-08-12 21:02:08 +08:00 · 2024-06-14 16:41:36 +08:00
parent 84eb7178ae 0d25e7cea3
commit 8f82ff3ab0
1 changed files with 2 additions and 1 deletions
@@ -14,7 +14,7 @@
        <result property="area" column="area"/>

    </resultMap>
-    <select id="selectGoodsList" resultMap="GoodsListMap">
+    <select id="selectGoodsList" resultMap="GoodsListMap" parameterType="java.lang.Long">


        select distinct
@@ -31,6 +31,7 @@
            join order_goods og on oi.order_id = og.order_id and oi.organ_id = og.organ_id

        where opi.organ_id = #{organId}
+            and
            opi.plan_id  in
        <foreach collection="planIds" item="ids" open="(" close=")" separator=",">
            #{ids}