优化帮助中心-栏目管理列表和帮助中心-栏目管理列表白名单接口，增加栏目名称字段模糊查询；

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/HceCategoryMapper.java

@@ -1,9 +1,8 @@
 package com.usky.system.mapper;
 
-import com.usky.system.domain.HceCategory;
 import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.system.domain.HceCategory;
 import com.usky.system.service.vo.HceCategoryListVO;
-import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,11 +16,11 @@ import java.util.List;
  * @since 2023-08-29
  */
 public interface HceCategoryMapper extends CrudMapper<HceCategory> {
-    List<HceCategoryListVO> selectMenuTreeAll(@Param("categoryName") String categoryName, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    List<HceCategoryListVO> selectMenuTreeAll(@Param("categoryIdList") List<Integer> categoryIdList, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    List<HceCategoryListVO> selectMenuTreeByUserId(@Param("categoryName") String categoryName, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("userId") Long userId);
+    List<HceCategoryListVO> selectMenuTreeByUserId(@Param("categoryIdList") List<Integer> categoryIdList, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("userId") Long userId);
 
-    List<HceCategoryListVO> selectMenuTreeByUserIdOne(@Param("categoryName") String categoryName, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("tenantId") Integer tenantId);
+    List<HceCategoryListVO> selectMenuTreeByUserIdOne(@Param("categoryIdList") List<Integer> categoryIdList, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("tenantId") Integer tenantId);
 
     List<HceCategory> getMenuNameList(@Param("categoryIdList") List<Integer> categoryIdList);
 

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

@@ -1,6 +1,8 @@
 package com.usky.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.mybatis.core.AbstractCrudService;
@@ -43,17 +45,30 @@ public class HceCategoryServiceImpl extends AbstractCrudService<HceCategoryMappe
         long userId = SecurityUtils.getUserId();
         SysUser sysUser = userService.selectUserByIdOne(userId);
         List<HceCategoryListVO> list = new ArrayList<>();
-        if(("00").equals(sysUser.getUserType())){
-            if (1L == userId)
-            {
-                list = baseMapper.selectMenuTreeAll(hceCategoryVO.getCategoryName(),hceCategoryVO.getStartTime(),hceCategoryVO.getEndTime());
+        List<Integer> categoryIdList = new ArrayList<>();
+        if(StringUtils.isNotBlank(hceCategoryVO.getCategoryName())){
+            LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.like(HceCategory::getCategoryName, hceCategoryVO.getCategoryName());
+            List<HceCategory> list1 = this.list(queryWrapper);
+            if(list1.size() > 0){
+                for (int i = 0; i < list1.size(); i++) {
+                    categoryIdList.add(list1.get(i).getId());
+                }
             }
-            else
-            {
-                list = baseMapper.selectMenuTreeByUserId(hceCategoryVO.getCategoryName(),hceCategoryVO.getStartTime(),hceCategoryVO.getEndTime(),userId);
+        }
+        if(CollectionUtils.isNotEmpty(categoryIdList)){
+            if(("00").equals(sysUser.getUserType())){
+                if (1L == userId)
+                {
+                    list = baseMapper.selectMenuTreeAll(categoryIdList,hceCategoryVO.getStartTime(),hceCategoryVO.getEndTime());
+                }
+                else
+                {
+                    list = baseMapper.selectMenuTreeByUserId(categoryIdList,hceCategoryVO.getStartTime(),hceCategoryVO.getEndTime(),userId);
+                }
+            }else{
+                list = baseMapper.selectMenuTreeByUserIdOne(categoryIdList,hceCategoryVO.getStartTime(),hceCategoryVO.getEndTime(),SecurityUtils.getTenantId());
             }
-        }else{
-            list = baseMapper.selectMenuTreeByUserIdOne(hceCategoryVO.getCategoryName(),hceCategoryVO.getStartTime(),hceCategoryVO.getEndTime(),SecurityUtils.getTenantId());
         }
 
         List<HceCategoryListVO> finalList = list;
@@ -68,7 +83,21 @@ public class HceCategoryServiceImpl extends AbstractCrudService<HceCategoryMappe
 
     @Override
     public List<HceCategoryListVO> pageWhite(HceCategoryVO hceCategoryVO){
-        List<HceCategoryListVO> list = baseMapper.selectMenuTreeAll(hceCategoryVO.getCategoryName(),hceCategoryVO.getStartTime(),hceCategoryVO.getEndTime());
+        List<HceCategoryListVO> list = new ArrayList<>();
+        List<Integer> categoryIdList = new ArrayList<>();
+        if(StringUtils.isNotBlank(hceCategoryVO.getCategoryName())){
+            LambdaQueryWrapper<HceCategory> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.like(HceCategory::getCategoryName, hceCategoryVO.getCategoryName());
+            List<HceCategory> list2 = this.list(queryWrapper);
+            if(list2.size() > 0){
+                for (int i = 0; i < list2.size(); i++) {
+                    categoryIdList.add(list2.get(i).getId());
+                }
+            }
+        }
+        if(CollectionUtils.isNotEmpty(categoryIdList)){
+            list = baseMapper.selectMenuTreeAll(categoryIdList,hceCategoryVO.getStartTime(),hceCategoryVO.getEndTime());
+        }
 
         List<HceCategoryListVO> finalList = list;
         List<HceCategoryListVO> list1 = list.stream().filter(s ->s.getParentId() == 0).map(

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

@@ -41,9 +41,10 @@
         where m.menu_type in ('M', 'C')
           and m.visible = 0
           and m.status = 0
-          <if test="categoryName != null">
-              and h.category_name = #{categoryName}
-          </if>
+        and h.id in
+        <foreach collection="categoryIdList" item="categoryId" index="index" open="(" close=")" separator=",">
+            #{categoryId}
+        </foreach>
           <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
               and h.createdate between #{startTime} and #{endTime}
           </if>
@@ -76,9 +77,10 @@
           and m.visible = 0
           and m.status = 0
           AND ro.status = 0
-        <if test="categoryName != null">
-            and h.category_name = #{categoryName}
-        </if>
+        and h.id in
+        <foreach collection="categoryIdList" item="categoryId" index="index" open="(" close=")" separator=",">
+            #{categoryId}
+        </foreach>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             and h.createdate between #{startTime} and #{endTime}
         </if>
@@ -109,9 +111,10 @@
           and m.visible = 0
           and m.status = 0
           AND t.tenant_id=#{tenantId}
-        <if test="categoryName != null">
-            and h.category_name = #{categoryName}
-        </if>
+        and h.id in
+        <foreach collection="categoryIdList" item="categoryId" index="index" open="(" close=")" separator=",">
+            #{categoryId}
+        </foreach>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             and h.createdate between #{startTime} and #{endTime}
         </if>