gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.1.5】api分组获取改为兼容写法

pull/22/MERGE v7.1.5
fengshuonan 2021-11-21 18:23:58 +08:00
parent eb218fefc7
commit 8be1fbb48c
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/mapping/ApiGroupMapper.xml
View File

@ -13,15 +13,7 @@
<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
ag.group_id
FROM
api_group ag
LEFT JOIN api_resource ar ON ag.group_id = ar.group_id
@ -43,4 +35,30 @@
OR ag.group_pid = -1
GROUP BY ag.group_id
</select>
<select id="dataList" resultType="cn.stylefeng.roses.kernel.system.modular.resource.entity.ApiGroup" databaseId="oracle">
SELECT
ag.group_id
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 '%' || #{paramCondition.groupName} || '%'
OR sr.url LIKE '%' || #{paramCondition.groupName} '%'
)
</if>
<if test="paramCondition.groupId != null">
AND (
ag.group_pids NOT LIKE '%[' || #{paramCondition.groupId} || ']%'
AND ag.group_id != #{paramCondition.groupId}
)
</if>
OR ag.group_pid = -1
GROUP BY ag.group_id
</select>
</mapper>

11
kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/ApiGroupServiceImpl.java
View File

@ -249,7 +249,16 @@ public class ApiGroupServiceImpl extends ServiceImpl<ApiGroupMapper, ApiGroup> i
}
private List<ApiGroup> dataList(ApiGroupRequest apiGroupRequest) {
return this.baseMapper.dataList(apiGroupRequest);
List<ApiGroup> apiGroups = this.baseMapper.dataList(apiGroupRequest);
// 根据每个记录的groupId填充其他信息
ArrayList<ApiGroup> arrayList = new ArrayList<>();
for (ApiGroup apiGroup : apiGroups) {
apiGroup = this.getById(apiGroup.getGroupId());
arrayList.add(apiGroup);
}
return arrayList;
}
@Override