修复：列表查询

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

@@ -62,4 +62,6 @@ public interface CategoriesDao {
   List<Categories> selectCategoryByDirectoryId(List<Integer> directoryIds);
 
   List<Categories> getCategoriesListByDirectoryIds(List<Integer> directoryIds);
+
+  int countChildById(Integer id);
 }

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

@@ -108,4 +108,6 @@ public interface GoodsInfoDao {
   void removeWareInfo(List<Integer> ids);
 
   List<SpecPriceVO> getPriceBySpecId(Integer productSpecId, Integer leaseTerm);
+
+  int countGoodsInfoByCategoryId(Integer id);
 }

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

@@ -41,7 +41,7 @@ public interface WebDeviceDao {
 
   List<GoodsInfo> listWareInfoPage(
       @Param("param") WareInfoQO param,
-      @Param("userIds") List<Integer> userId,
+      @Param("userIds") List<Integer> userIds,
       @Param("type") Integer type);
 
   WareInfoDO getWareInfoById(Integer id);

src/main/java/com/mmc/pms/service/Impl/CategoriesServiceImpl.java

@@ -240,11 +240,11 @@ public class CategoriesServiceImpl implements CategoriesService {
   @Override
   public List<AllCategoryDTO> feigQqueryCategoryInfoByType(Integer type) {
     List<DirectoryDO> categoryDirectoryList = getCategoryDirectoryList(type);
-    if (CollectionUtils.isNotEmpty(categoryDirectoryList)){
+    if (CollectionUtils.isNotEmpty(categoryDirectoryList)) {
       List<AllCategoryDTO> allCategoryDTOList =
-              categoryDirectoryList.stream()
-                      .map(DirectoryDO::buildAllCategoryDTO)
-                      .collect(Collectors.toList());
+          categoryDirectoryList.stream()
+              .map(DirectoryDO::buildAllCategoryDTO)
+              .collect(Collectors.toList());
       Map<Integer, List<CategoriesInfoListDTO>> categoryMap = getCategoryMap(allCategoryDTOList);
       addSubCategories(allCategoryDTOList, categoryMap);
       System.out.println("Res: " + JSONObject.toJSON(allCategoryDTOList));
@@ -255,7 +255,19 @@ public class CategoriesServiceImpl implements CategoriesService {
 
   @Override
   public ResultBody deleteRelevantBusiness(Integer id) {
-    int count = categoriesDao.deleteById(id);
+    int count = goodsInfoDao.countGoodsInfoByCategoryId(id);
+    if (count > 0) {
+      return ResultBody.error(ResultEnum.GROUP_DONT_DELETE);
+    }
+    // 获取分类信息
+    Categories categories = categoriesDao.getGoodsGroupById(id);
+    if (categories != null && categories.getParentId().equals(0)) {
+      int childCount = categoriesDao.countChildById(id);
+      if (childCount > 0) {
+        return ResultBody.error(ResultEnum.GROUP_DONT_DELETE_BY_CHILD);
+      }
+    }
+    categoriesDao.deleteById(id);
     return ResultBody.success();
   }
 

src/main/java/com/mmc/pms/service/Impl/WebDeviceServiceImpl.java

@@ -23,6 +23,7 @@ import com.mmc.pms.model.sale.vo.SpecPriceVO;
 import com.mmc.pms.page.PageResult;
 import com.mmc.pms.service.WebDeviceService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -171,7 +172,9 @@ public class WebDeviceServiceImpl implements WebDeviceService {
               param.getProvinceId(),
               null,
               null,
-              request == null ? null : request.getHeader(TokenConstant.TOKEN));
+              StringUtils.isBlank(request.getHeader(TokenConstant.TOKEN))
+                  ? null
+                  : request.getHeader(TokenConstant.TOKEN));
       if (userIds == null || userIds.size() == 0) {
         userIds = Collections.singletonList(-1);
       }
@@ -183,7 +186,7 @@ public class WebDeviceServiceImpl implements WebDeviceService {
     }
     int pageNo = param.getPageNo();
     param.buildCurrentPage();
-    if (request == null) {
+    if (StringUtils.isBlank(request.getHeader(TokenConstant.TOKEN))) {
       List<GoodsInfo> list = webDeviceDao.listWareInfoPage(param, userIds, param.getType());
       List<LeaseGoodsInfoDTO> pageList =
           list.stream().map(GoodsInfo::buildLeaseGoodsInfoDTO).collect(Collectors.toList());

src/main/resources/mapper/CategoriesDao.xml

@@ -215,6 +215,13 @@
             </foreach>
         </where>
     </select>
+    <select id="countChildById" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM categories c1
+                 INNER JOIN categories c2 ON c1.id = c2.parent_id
+            AND c2.is_deleted = 0
+        WHERE c1.id = #{id}
+    </select>
 
     <update id="deleteById">
         UPDATE `categories`

src/main/resources/mapper/GoodsInfoDao.xml

@@ -579,4 +579,11 @@
           AND lease_term = #{leaseTerm}
           and type = 1
     </select>
+    <select id="countGoodsInfoByCategoryId" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM categories c
+                 LEFT JOIN goods_info gi ON gi.category_by_one = c.id OR gi.category_by_two = c.id
+        WHERE c.is_deleted = 0
+          AND c.id = #{id}
+    </select>
 </mapper>

src/main/resources/mapper/WebDeviceDao.xml

@@ -181,7 +181,8 @@
         <where>
             gi.is_deleted = 0 and gi.shelf_status = 1 and gi.goods_type = #{type}
             <if test="param.categoryId != null">
-                <foreach collection="param" item="item" index="index" open="and gi.category_by_one IN (" close=")"
+                <foreach collection="param.categoryId" item="item" index="index" open="and gi.category_by_one IN ("
+                         close=")"
                          separator=",">
                     #{item}
                 </foreach>