Bläddra i källkod

Merge remote-tracking branch 'origin/master'

lucky 5 månader sedan
förälder
incheckning
044940f328

+ 1 - 1
zkqy-custom-business/src/main/resources/mapper/business/ProductInventoryMapper.xml

@@ -283,7 +283,7 @@
         <if test="lotNum != null and lotNum != '' ">and lot_num = #{lotNum}</if>
         <if test="productId != null">and a.product_id = #{productId}</if>
         <if test="productColour != null and productColour != ''">and bb.colours LIKE concat('%', #{productColour},
-            '%')</if>
+            '%')  OR a.product_colour LIKE concat('%',#{productColour},'%')</if>
         <if test="inventoryType != null and inventoryType != ''">and a.inventory_type = #{inventoryType}</if>
     </select>