修改

src/main/java/com/dk/mdm/mapper/ivt/InboundItemMapper.xml

@@ -831,10 +831,14 @@
                 AND tpii.into_status =
                 any(#{intoStatusList, typeHandler= StringListTypeHandler})
             </if>
+            <if test="brandId != null and brandId != ''">
+                AND tmgb.brand_id = #{brandId}::uuid
+            </if>
             <if test="skuIdFlag !=null and skuIdFlag == true">
                 AND tpii.sku_id is null
             </if>
 
+
             <if test="searchText !=null">
                 AND  (tpii.sku_model LIKE concat('%',my_ex.likequery(#{searchText}), '%')
                 OR   tpii.sku_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
@@ -885,6 +889,9 @@
             <if test="intoDateEnd != null">
                 AND tpo.out_date &lt; #{intoDateEnd}::timestamp with time zone + interval '1 day'
             </if>
+            <if test="brandId != null and brandId != ''">
+                AND tmgb.brand_id = #{brandId}::uuid
+            </if>
             <if test="skuIdFlag !=null and skuIdFlag == true">
                 AND tpoi.sku_id is null
             </if>
@@ -998,6 +1005,9 @@
                 AND tpii.into_status =
                 any(#{intoStatusList, typeHandler= StringListTypeHandler})
             </if>
+            <if test="brandId != null and brandId != ''">
+                AND tmgb.brand_id = #{brandId}::uuid
+            </if>
             <if test="skuIdFlag !=null and skuIdFlag == true">
                 AND tpii.sku_id is null
             </if>
@@ -1049,6 +1059,9 @@
             <if test="intoDateEnd != null">
                 AND tpo.out_date &lt; #{intoDateEnd}::timestamp with time zone + interval '1 day'
             </if>
+            <if test="brandId != null and brandId != ''">
+                AND tmgb.brand_id = #{brandId}::uuid
+            </if>
             <if test="skuIdFlag !=null and skuIdFlag == true">
                 AND tpoi.sku_id is null
             </if>