Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/pms into 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: 100b04645cd4830000932be2c847c3b98202480e
+  newTag: 17b51a7f10ed3f62402eaeb980ee72c2baab2211

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

@@ -9,7 +9,10 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 目录管理表(Directory)实体类
@@ -43,7 +46,7 @@ public class DirectoryDO implements Serializable {
 
   public DirectoryDO(DirectoryInfoVO param) {
     if (CollectionUtils.isNotEmpty(param.getShow())) {
-      String show = StringUtils.join(param.getShow(), ",");
+      String show = param.getShow().stream().map(Object::toString).collect(Collectors.joining(","));
       this.show = show;
     }
     this.id = param.getId();
@@ -52,7 +55,18 @@ public class DirectoryDO implements Serializable {
   }
 
   public DirectoryInfoVO buildDirectoryInfoVO() {
-    return DirectoryInfoVO.builder().id(id).directoryName(directoryName).type(type).build();
+    List<Integer> show = null;
+    if (!StringUtils.isBlank(this.show)) {
+      String[] split = this.show.split(",");
+      show = Arrays.stream(split).map(Integer::parseInt).collect(Collectors.toList());
+    }
+
+    return DirectoryInfoVO.builder()
+        .id(id)
+        .directoryName(directoryName)
+        .show(show)
+        .type(type)
+        .build();
   }
 
   public AllCategoryDTO buildAllCategoryDTO() {

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

@@ -52,7 +52,7 @@ public class CategoriesServiceImpl implements CategoriesService {
     } else {
       // 获取默认目录信息
       DirectoryDO directoryDO = categoriesDao.selectDirectoryById(param.getId());
-      if (!directoryDO.getDirectoryName().equals(param.getDirectoryName())) {
+      if (directoryDO != null && !directoryDO.getDirectoryName().equals(param.getDirectoryName())) {
         return ResultBody.error(ResultEnum.DEFAULT_DIRECTORY);
       }
       categoriesDao.updateDirectory(directory);

src/main/resources/mapper/CategoriesDao.xml

@@ -25,8 +25,7 @@
         is_deleted
     </sql>
     <insert id="insertDirectory">
-        insert into directory(directory_name,
-                              `type`, show)
+        insert into directory (directory_name, `type`, `show`)
         values (#{directoryName}, #{type}, #{show})
     </insert>
     <insert id="insertClassification">
@@ -43,7 +42,7 @@
         update directory
         set directory_name = #{directoryName},
             `type`         = #{type},
-            show           = #{show}
+            `show`         = #{show}
         where id = #{id}
     </update>
     <update id="removeDirectory">
@@ -88,7 +87,8 @@
         SELECT d.id,
         d.directory_name,
         d.`type`,
-        d.create_time
+        d.create_time,
+        d.show
         FROM `directory` d
         <where>
             d.is_deleted = 0