From d681346f489a0d1c979b377fac3d426c03cd0b26 Mon Sep 17 00:00:00 2001
From: rays <1615175118@qq.com>
Date: Sat, 19 Jun 2021 10:08:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E7=BB=84=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/mapper/ApiGroupMapper.java       | 12 ++++++++++
 .../mapper/mapping/ApiGroupMapper.xml         | 23 +++++++++++++++++++
 .../service/impl/ApiGroupServiceImpl.java     |  7 ++++--
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/ApiGroupMapper.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/ApiGroupMapper.java
index a4311fc7a..b6b33a48d 100644
--- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/ApiGroupMapper.java
+++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/ApiGroupMapper.java
@@ -1,10 +1,13 @@
 package cn.stylefeng.roses.kernel.system.modular.resource.mapper;
 
 import cn.stylefeng.roses.kernel.dict.api.pojo.dict.request.ParentIdsUpdateRequest;
+import cn.stylefeng.roses.kernel.system.api.pojo.resource.ApiGroupRequest;
 import cn.stylefeng.roses.kernel.system.modular.resource.entity.ApiGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 接口分组 Mapper 接口
  *
@@ -20,4 +23,13 @@ public interface ApiGroupMapper extends BaseMapper<ApiGroup> {
      * @date 2021/5/22 上午10:03
      **/
     void updateSubPids(@Param("paramCondition") ParentIdsUpdateRequest parentIdsUpdateRequest);
+
+    /**
+     * 获取分组列表
+     *
+     * @return {@link List< ApiGroup>}
+     * @author majianguo
+     * @date 2021/6/19 上午10:03
+     **/
+    List<ApiGroup> dataList(@Param("paramCondition") ApiGroupRequest apiGroupRequest);
 }
\ No newline at end of file
diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/mapping/ApiGroupMapper.xml b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/mapping/ApiGroupMapper.xml
index bc4875354..479372ff9 100644
--- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/mapping/ApiGroupMapper.xml
+++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/mapping/ApiGroupMapper.xml
@@ -10,4 +10,27 @@
             update_user = #{paramCondition.updateUser}
         WHERE group_pids LIKE CONCAT('%', #{paramCondition.oldParentIds}, '%')
     </update>
+
+    <select id="dataList" resultType="cn.stylefeng.roses.kernel.system.modular.resource.entity.ApiGroup">
+        SELECT
+        ag.group_id,
+        ag.group_name,
+        ag.group_pid,
+        ag.group_pids,
+        ag.group_sort,
+        ag.create_time,
+        ag.create_user,
+        ag.update_time,
+        ag.update_user
+        FROM
+        api_group ag
+        LEFT JOIN api_resource ar ON ag.group_id = ar.group_id
+        LEFT JOIN sys_resource sr ON ar.resource_code = sr.resource_code
+        WHERE
+        1 = 1
+        <if test="paramCondition.groupName != null and paramCondition.groupName != ''">
+            AND ar.api_alias LIKE CONCAT('%', #{paramCondition.groupName}, '%')
+            OR sr.url LIKE CONCAT('%', #{paramCondition.groupName}, '%')
+        </if>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/ApiGroupServiceImpl.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/ApiGroupServiceImpl.java
index 0c47df321..a283fcd24 100644
--- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/ApiGroupServiceImpl.java
+++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/ApiGroupServiceImpl.java
@@ -189,8 +189,7 @@ public class ApiGroupServiceImpl extends ServiceImpl<ApiGroupMapper, ApiGroup> i
             wrapper.ne(ApiGroup::getGroupId, apiGroupRequest.getGroupId());
         }
 
-        List<ApiGroup> apiGroups = this.list(wrapper);
-
+        List<ApiGroup> apiGroups = this.dataList(apiGroupRequest);
         if (ObjectUtil.isNotEmpty(apiGroups)) {
             for (ApiGroup apiGroup : apiGroups) {
                 ApiGroupTreeWrapper item = new ApiGroupTreeWrapper();
@@ -227,6 +226,10 @@ public class ApiGroupServiceImpl extends ServiceImpl<ApiGroupMapper, ApiGroup> i
         return allApiGroupTreeWrapperList;
     }
 
+    private List<ApiGroup> dataList(ApiGroupRequest apiGroupRequest) {
+        return this.baseMapper.dataList(apiGroupRequest);
+    }
+
     @Override
     public List<ApiGroupTreeWrapper> groupTree(ApiGroupRequest apiGroupRequest) {
         // 结果