Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: b49c7ce0b60324d1d5a345e231054c2992490603
+  newTag: 4f4b315dae822973a98907e615f45940937f4d1d

src/main/java/com/mmc/pms/dao/IndustrySpecDao.java

@@ -13,8 +13,8 @@ import java.util.Set;
 
 /**
  * @Author LW
- * @date 2022/10/8 10:58
- * 概要：
+ *
+ * @date 2022/10/8 10:58 概要：
  */
 @Mapper
 public interface IndustrySpecDao {
@@ -54,7 +54,8 @@ public interface IndustrySpecDao {
 
   int countListPageIndustrySpec(Integer id, String keyword);
 
-    List<IndustrySpecDO> listPageIndustrySpec(int pageNo, Integer pageSize, Integer industrySkuId, String keyword);
+  List<IndustrySpecDO> listPageIndustrySpec(
+      int pageNo, Integer pageSize, Integer industrySkuId, String keyword);
 
   int batchInsertSpecPrice(List<IndustrySpecPriceDO> list);
 
@@ -74,10 +75,10 @@ public interface IndustrySpecDao {
 
   void batchUpdateMallIndustSpec(@Param("list") List<Integer> list, @Param("id") Integer id);
 
+  List<IndustryProductInventoryDO> listIndustryProdInventory(
+      @Param("inventoryIds") Set<Integer> inventoryIds);
 
-    List<IndustryProductInventoryDO> listIndustryProdInventory(Set<Integer> inventoryIds);
-
-    List<IndustrySpecDO> listIndustrySpec(Set<Integer> industrySpecIds);
+  List<IndustrySpecDO> listIndustrySpec(@Param("industrySpecIds") Set<Integer> industrySpecIds);
 
   int countIndustrySpecBySkuId(Integer id);
 

src/main/resources/mapper/IndustrySpecDao.xml

@@ -311,12 +311,10 @@
         industry_spec ins
         INNER JOIN industry_sku inds ON ins.industry_sku_id = inds.id
         WHERE
-        ins.id IN (
-        <foreach collection="industrySpecIds" separator="," item="id" index="index">
+        ins.is_deleted = 0
+        <foreach collection="industrySpecIds" separator="," item="id" index="index" open="AND ins.id IN (" close=")">
             #{id}
         </foreach>
-        )
-        AND ins.is_deleted = 0
     </select>
     <select id="countIndustrySpecBySkuId" resultType="java.lang.Integer">
         select count(*)