修改：目录分类信息

src/main/java/com/mmc/pms/common/ResultEnum.java

@@ -407,7 +407,7 @@ public enum ResultEnum implements BaseErrorInfoInterface {
   ALREADY_DIVIDE_ERROR("2011", "订单已分成"),
   DIVIDE_OBJ_NOT_EXIST("2012", "先点击确认添加分成对象"),
 
-  DEFAULT_DIRECTORY("3001", "默认目录不可删除或修改！");
+  DEFAULT_DIRECTORY("3001", "默认目录不可删除或修改名称！");
   /**
    * 错误码
    *

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

@@ -14,56 +14,50 @@ import java.util.Set;
 /**
  * @author 23214
  * @description 针对表【categories(通用分类表)】的数据库操作Mapper
- * @createDate 2023-05-24 10:29:28
- * @Entity com.mmc.pms.entity.Categories
+ * @createDate 2023-05-24 10:29:28 @Entity com.mmc.pms.entity.Categories
  */
 @Mapper
 public interface CategoriesDao {
 
-    int countUpdateDirectoryName(DirectoryInfoVO param);
+  int countUpdateDirectoryName(DirectoryInfoVO param);
 
-    void insertDirectory(DirectoryDO directory);
+  void insertDirectory(DirectoryDO directory);
 
-    void updateDirectory(DirectoryDO directory);
+  void updateDirectory(DirectoryDO directory);
 
-    int countDirectoryList();
+  int countDirectoryList();
 
-    List<DirectoryDO> directoryList(int pageNo, Integer pageSize, Integer type);
+  List<DirectoryDO> directoryList(int pageNo, Integer pageSize, Integer type);
 
-    int countDirectory(Integer id);
+  int countDirectory(Integer id);
 
-    void removeDirectory(Integer id);
+  void removeDirectory(Integer id);
 
-    int countClassificationByName(ClassifyInfoVO classifyInfoVO);
+  int countClassificationByName(ClassifyInfoVO classifyInfoVO);
 
-    int getCountCategoriesByPid(Integer pid, Integer type);
+  int getCountCategoriesByPid(Integer pid, Integer type);
 
-    void insertClassification(Categories categories);
+  void insertClassification(Categories categories);
 
-    void updateClassification(ClassifyInfoVO classifyInfoVO);
+  void updateClassification(ClassifyInfoVO classifyInfoVO);
 
-    Categories getGoodsGroupById(Integer id);
+  Categories getGoodsGroupById(Integer id);
 
-    int updateTypeSort(Integer id, Integer sort);
+  int updateTypeSort(Integer id, Integer sort);
 
-    List<Categories> selectAllClassification(QueryClassifyVO queryClassifyVO);
+  List<Categories> selectAllClassification(QueryClassifyVO queryClassifyVO);
 
-    int countListClassification(QueryClassifyVO queryClassifyVO);
+  int countListClassification(QueryClassifyVO queryClassifyVO);
 
-    int selectDirectoryById(Integer id);
+  DirectoryDO selectDirectoryById(Integer id);
 
-    int deleteById(Integer id);
+  int deleteById(Integer id);
 
-    List<DirectoryDO> getDirectoryList(Integer type);
+  List<DirectoryDO> getDirectoryList(Integer type);
 
-    List<Categories> getCategoriesByDirectoryId(Integer directoryId);
+  List<Categories> getCategoriesByDirectoryId(Integer directoryId);
 
-    List<Categories> getCategoriesListByIds(@Param("ids") Set<Integer> ids);
-
-    List<Categories> selectCategoryByDirectoryId(List<Integer> directoryIds);
+  List<Categories> getCategoriesListByIds(@Param("ids") Set<Integer> ids);
 
+  List<Categories> selectCategoryByDirectoryId(List<Integer> directoryIds);
 }
-
-
-
-

src/main/java/com/mmc/pms/entity/Categories.java

@@ -76,6 +76,11 @@ public class Categories implements Serializable {
   }
 
   public CategoriesInfoListDTO buildCategoriesInfoListDTO() {
-    return CategoriesInfoListDTO.builder().id(id).icon(icon).name(name).build();
+    return CategoriesInfoListDTO.builder()
+        .id(id)
+        .directoryId(directoryId)
+        .icon(icon)
+        .name(name)
+        .build();
   }
 }

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

@@ -49,8 +49,9 @@ public class CategoriesServiceImpl implements CategoriesService {
     if (param.getId() == null) {
       categoriesDao.insertDirectory(directory);
     } else {
-      int count = categoriesDao.selectDirectoryById(param.getId());
-      if (count > 0) {
+      // 获取默认目录信息
+      DirectoryDO directoryDO = categoriesDao.selectDirectoryById(param.getId());
+      if (!directoryDO.getDirectoryName().equals(param.getDirectoryName())) {
         return ResultBody.error(ResultEnum.DEFAULT_DIRECTORY);
       }
       categoriesDao.updateDirectory(directory);
@@ -78,8 +79,8 @@ public class CategoriesServiceImpl implements CategoriesService {
     if (count > 0) {
       return ResultBody.error(ResultEnum.THERE_ARE_CATEGORIES_IN_THE_DIRECTORY);
     }
-    int defaultCount = categoriesDao.selectDirectoryById(id);
-    if (defaultCount > 0) {
+    DirectoryDO defaultCount = categoriesDao.selectDirectoryById(id);
+    if (defaultCount != null) {
       return ResultBody.error(ResultEnum.DEFAULT_DIRECTORY);
     }
     categoriesDao.removeDirectory(id);

src/main/resources/mapper/CategoriesDao.xml

@@ -25,9 +25,9 @@
         is_deleted
     </sql>
     <insert id="insertDirectory">
-        insert into directory(directory_name, pid,
-                              `type`)
-        values (#{directoryName}, #{pid}, #{type})
+        insert into directory(directory_name,
+                              `type`, show)
+        values (#{directoryName}, #{type}, #{show})
     </insert>
     <insert id="insertClassification">
         insert into categories (parent_id,
@@ -42,8 +42,8 @@
     <update id="updateDirectory">
         update directory
         set directory_name = #{directoryName},
-            pid            = #{pid},
-            `type`         = #{type}
+            `type`         = #{type},
+            show           = #{show}
         where id = #{id}
     </update>
     <update id="removeDirectory">
@@ -87,12 +87,9 @@
     <select id="directoryList" resultType="com.mmc.pms.entity.DirectoryDO">
         SELECT d.id,
         d.directory_name,
-        d.pid,
         d.`type`,
-        d.create_time,
-        dt.directory_name relevanceName
+        d.create_time
         FROM `directory` d
-        LEFT JOIN `directory` dt ON dt.id = d.pid
         <where>
             d.is_deleted = 0
             <if test="type != null">
@@ -162,23 +159,15 @@
           AND directory_id = #{directoryId}
           AND `type` = #{type}
     </select>
-    <select id="selectDirectoryById" resultType="java.lang.Integer">
-        select count(*)
-        from directory
-        where id = #{id}
-          and is_default = 0
-    </select>
     <select id="getDirectoryList" resultType="com.mmc.pms.entity.DirectoryDO">
         SELECT d.id,
                d.directory_name,
-               d.pid,
                d.`type`,
                d.create_time
         FROM `directory` d
         WHERE d.is_deleted = 0
             AND d.type = #{type}
-           OR d.type = 0
-            AND d.pid IS NULL
+           or (type = 0 and `show` like CONCAT('%', #{type}, '%'))
         ORDER BY create_time DESC
     </select>
     <select id="selectCategoryByDirectoryId" resultType="com.mmc.pms.entity.Categories">
@@ -192,8 +181,13 @@
         </where>
     </select>
 
-    <select id="getCategoriesByDirectoryId" resultType="com.mmc.pms.entity.Categories" parameterType="java.lang.Integer">
-        SELECT id,`name` from categories where directory_id = #{directoryId} and is_deleted = 0 order by create_time desc
+    <select id="getCategoriesByDirectoryId" resultType="com.mmc.pms.entity.Categories"
+            parameterType="java.lang.Integer">
+        SELECT id, `name`
+        from categories
+        where directory_id = #{directoryId}
+          and is_deleted = 0
+        order by create_time desc
     </select>
 
     <select id="getCategoriesListByIds" resultType="com.mmc.pms.entity.Categories">
@@ -204,6 +198,12 @@
         </foreach>
         and is_deleted = 0
     </select>
+    <select id="selectDirectoryById" resultType="com.mmc.pms.entity.DirectoryDO">
+        select id, directory_name
+        from directory
+        where id = #{id}
+          and is_default = 0
+    </select>
 
     <update id="deleteById">
         UPDATE `categories`