'优化帮助中心-栏目管理列表接口，过滤没有栏目信息的菜单信息记录;优化帮助中心-栏目管理新增和帮助中心-栏目管理修改两个接口，新增栏目状态;0:关闭 1:开启字段的录入和展示;'

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/HceCategoryServiceImpl.java

@@ -81,12 +81,12 @@ public class HceCategoryServiceImpl extends AbstractCrudService<HceCategoryMappe
     }
 
     public void add(HceCategory hceCategory){
-        LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(HceCategory::getCategoryName,hceCategory.getCategoryName());
-        List<HceCategory> list = this.list(queryWrapper);
-        if(list.size() > 0){
-            throw new BusinessException("栏目名称重复，请重新填写栏目名称");
-        }
+//        LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
+//        queryWrapper.eq(HceCategory::getCategoryName,hceCategory.getCategoryName());
+//        List<HceCategory> list = this.list(queryWrapper);
+//        if(list.size() > 0){
+//            throw new BusinessException("栏目名称重复，请重新填写栏目名称");
+//        }
         LambdaQueryWrapper<HceCategory> queryWrapper1 = Wrappers.lambdaQuery();
         queryWrapper1.eq(HceCategory::getMenuId,hceCategory.getMenuId());
         List<HceCategory> list1 = this.list(queryWrapper1);
@@ -94,18 +94,17 @@ public class HceCategoryServiceImpl extends AbstractCrudService<HceCategoryMappe
             throw new BusinessException("关联菜单名称重复");
         }
         hceCategory.setCreatedate(LocalDateTime.now());
-        hceCategory.setStatus(1);
         this.save(hceCategory);
     }
 
     public void update(HceCategory hceCategory){
-        LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(HceCategory::getCategoryName,hceCategory.getCategoryName())
-                .ne(HceCategory::getId,hceCategory.getId());
-        List<HceCategory> list = this.list(queryWrapper);
-        if(list.size() > 0){
-            throw new BusinessException("栏目名称重复，请重新填写栏目名称");
-        }
+//        LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
+//        queryWrapper.eq(HceCategory::getCategoryName,hceCategory.getCategoryName())
+//                .ne(HceCategory::getId,hceCategory.getId());
+//        List<HceCategory> list = this.list(queryWrapper);
+//        if(list.size() > 0){
+//            throw new BusinessException("栏目名称重复，请重新填写栏目名称");
+//        }
         LambdaQueryWrapper<HceCategory> queryWrapper1 = Wrappers.lambdaQuery();
         queryWrapper1.eq(HceCategory::getMenuId,hceCategory.getMenuId())
                 .ne(HceCategory::getId,hceCategory.getId());

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/HceCategoryListVO.java

@@ -71,6 +71,11 @@ public class HceCategoryListVO {
      */
     private String description;
 
+    /**
+     * 栏目状态;0:关闭 1:开启
+     */
+    private Integer status;
+
     /**
      * 子级
      */

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/HceCategoryMapper.xml

@@ -31,10 +31,11 @@
                         h.imagePath as imagePath,
                         h.createdate as createdate,
                         h.modifydate as modifydate,
-                        h.description as description
+                        h.description as description,
+                        h.status as status
         from sys_menu m
             left join sys_role_menu rm on m.menu_id = rm.menu_id
-            LEFT JOIN hce_category h on m.menu_id = h.menu_id
+            inner JOIN hce_category h on m.menu_id = h.menu_id
         where m.menu_type in ('M', 'C')
           and m.visible = 0
           and m.status = 0
@@ -58,13 +59,14 @@
                         h.imagePath as imagePath,
                         h.createdate as createdate,
                         h.modifydate as modifydate,
-                        h.description as description
+                        h.description as description,
+                        h.status as status
         from sys_menu m
                  left join sys_role_menu rm on m.menu_id = rm.menu_id
                  left join sys_user_role ur on rm.role_id = ur.role_id
                  left join sys_role ro on ur.role_id = ro.role_id
                  left join sys_user u on ur.user_id = u.user_id
-                 LEFT JOIN hce_category h on m.menu_id = h.menu_id
+                 inner join hce_category h on m.menu_id = h.menu_id
         where u.user_id = #{userId}
           and m.menu_type in ('M', 'C')
           and m.visible = 0
@@ -91,11 +93,12 @@
                     h.imagePath as imagePath,
                     h.createdate as createdate,
                     h.modifydate as modifydate,
-                    h.description as description
+                    h.description as description,
+                    h.status as status
         FROM
             sys_menu m
                 JOIN sys_tenant_menu t on m.menu_id = t.menu_id
-                 LEFT JOIN hce_category h on m.menu_id = h.menu_id
+                inner join hce_category h on m.menu_id = h.menu_id
         WHERE m.menu_type IN ('M', 'C')
           and m.visible = 0
           and m.status = 0