From 4a24ab8126f83c8e11270b8fd4a662b2a990ed08 Mon Sep 17 00:00:00 2001
From: yangsong <yangsong@axzo.cn>
Date: Tue, 12 Sep 2023 21:05:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=83=A8=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/axzo/tyr/client/feign/SaasRoleGroupApi.java  |  3 +++
 .../role/SaasPermissionGroupController.java         | 10 +++++++++-
 .../controller/role/SaasRoleGroupController.java    | 13 +++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java
index d2a1d414..0a61b026 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java
@@ -30,6 +30,9 @@ public interface SaasRoleGroupApi {
     @PostMapping("/api/saasRoleGroup/getList")
     ApiResult<List<SaasRoleGroupVO>> getList(@RequestBody QuerySaasRoleGroupReq req);
 
+    @PostMapping("/api/saasRoleGroup/getById")
+    ApiResult<SaasRoleGroupVO> getById(@RequestParam("id") Long id);
+
     /**
      * 删除
      */
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasPermissionGroupController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasPermissionGroupController.java
index 27bc90e0..db0db94d 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasPermissionGroupController.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasPermissionGroupController.java
@@ -1,6 +1,8 @@
 package cn.axzo.tyr.server.controller.role;
 
 
+import cn.axzo.framework.domain.web.BizException;
+import cn.axzo.framework.domain.web.code.BaseCode;
 import cn.axzo.framework.domain.web.result.ApiPageResult;
 import cn.axzo.framework.domain.web.result.ApiResult;
 import cn.axzo.tyr.client.feign.SaasPermissionGroupApi;
@@ -10,8 +12,10 @@ import cn.axzo.tyr.server.repository.service.SaasPermissionGroupDao;
 import cn.axzo.tyr.server.repository.service.SaasPermissionGroupScopeDao;
 import cn.axzo.tyr.server.repository.service.SaasPgroupPermissionRelationDao;
 import cn.axzo.tyr.server.service.PermissionGroupService;
+import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -34,7 +38,11 @@ public class SaasPermissionGroupController implements SaasPermissionGroupApi {
 
 	@Override
 	public ApiResult<SaasPermissionGroupVO> getById(Long id) {
-		return null;
+		List<SaasPermissionGroupVO> pGroups = permissionGroupService.query(QuerySaasPermissionGroupReq.builder().ids(Lists.newArrayList(id)).build());
+		if (CollectionUtils.isEmpty(pGroups)) {
+			throw new BizException(BaseCode.BAD_REQUEST, "未查询到权限组信息");
+		}
+		return ApiResult.ok(pGroups.get(0));
 	}
 
 	@Override
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleGroupController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleGroupController.java
index 4971b46d..698dc814 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleGroupController.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleGroupController.java
@@ -1,12 +1,16 @@
 package cn.axzo.tyr.server.controller.role;
 
+import cn.axzo.framework.domain.web.BizException;
+import cn.axzo.framework.domain.web.code.BaseCode;
 import cn.axzo.framework.domain.web.result.ApiResult;
 import cn.axzo.tyr.client.feign.SaasRoleGroupApi;
 import cn.axzo.tyr.client.model.req.QuerySaasRoleGroupReq;
 import cn.axzo.tyr.client.model.vo.SaasRoleGroupVO;
 import cn.axzo.tyr.server.service.SaasRoleGroupService;
+import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -29,6 +33,15 @@ public class SaasRoleGroupController implements SaasRoleGroupApi {
         return ApiResult.ok(saasRoleGroupService.getList(req));
     }
 
+    @Override
+    public ApiResult<SaasRoleGroupVO> getById(Long id) {
+        List<SaasRoleGroupVO> roleGroups = saasRoleGroupService.getList(QuerySaasRoleGroupReq.builder().ids(Lists.newArrayList(id)).build());
+        if (CollectionUtils.isEmpty(roleGroups)) {
+            throw new BizException(BaseCode.BAD_REQUEST, "未查询到角色分组信息");
+        }
+        return ApiResult.ok(roleGroups.get(0));
+    }
+
     @Override
     public ApiResult delete(List<Long> id) {