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

blade-service/blade-sales-part/pom.xml

@@ -91,6 +91,12 @@
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper</artifactId>
             <version>5.3.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.jsqlparser</groupId>
+                    <artifactId>jsqlparser</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/mapper/ProductLaunchMapper.xml

@@ -173,13 +173,13 @@
             and ppl.self_recovery = #{selfRecovery}
         </if>
         <if test="cnameStatus == 1">
-            and (ppl.goods_name like concat('%', #{cname}, '%') or ppl.cname_int like concat('%', #{cname}, '%')
+            and (ppl.cname like concat('%', #{cname}, '%') or ppl.cname_int like concat('%', #{cname}, '%')
             or ppl.brand_item like concat('%', #{cname}, '%') or ppl.specification_and_model like concat('%', #{cname},
             '%'))
             and ppl.brand_name like concat('%', #{brandName}, '%')
         </if>
         <if test="cnameStatus == 2">
-            and (ppl.goods_name like concat('%', #{cname}, '%') or ppl.cname_int like concat('%', #{cname}, '%')
+            and (ppl.cname like concat('%', #{cname}, '%') or ppl.cname_int like concat('%', #{cname}, '%')
             or ppl.brand_item like concat('%', #{cname}, '%') or ppl.specification_and_model like concat('%', #{cname},
             '%')
             <if test="brandName != null  and brandName != ''">
@@ -188,11 +188,11 @@
             )
         </if>
         <if test="cnameStatus == 3">
-            and (ppl.goods_name like concat('%', #{cname}, '%') or ppl.cname_int like concat('%', #{cname}, '%'))
+            and (ppl.cname like concat('%', #{cname}, '%') or ppl.cname_int like concat('%', #{cname}, '%')
+            or ppl.brand_item like concat('%', #{cname}, '%') or ppl.specification_and_model like concat('%', #{cname}, '%'))
         </if>
         <if test="goodsIds != null and goodsIds.size > 0">
-            and ppl.goods_id in('%', #{cname}, '%')
-            or ppl.brand_item like concat('%', #{cname}, '%') or ppl.specification_and_mo
+            and ppl.goods_id in
             <foreach collection="goodsIds" item="goodsId" open="(" close=")" separator=",">
                 #{goodsId}
             </foreach>

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shopping/mapper/ShoppingMallDetailMapper.xml

@@ -106,11 +106,11 @@
             )
         </if>
         <if test="cnameStatus == 3">
-            and (fpd.goods_name like concat('%', #{cname}, '%') or fpd.cname_int like concat('%', #{cname}, '%'))
+            and (fpd.goods_name like concat('%', #{cname}, '%') or fpd.cname_int like concat('%', #{cname}, '%')
+            or fpd.brand_item like concat('%', #{cname}, '%') or fpd.specification_and_model like concat('%', #{cname}, '%'))
         </if>
         <if test="goodsIds != null and goodsIds.size > 0">
-        and fpd.goods_id in('%', #{cname}, '%')
-            or fpd.brand_item like concat('%', #{cname}, '%') or fpd.specification_and_mo
+        and fpd.goods_id in
             <foreach collection="goodsIds" item="goodsId" open="(" close=")" separator=",">
                 #{goodsId}
             </foreach>