From b73028b192bb0effc61238dd55fa8d1e149a9a69 Mon Sep 17 00:00:00 2001
From: yangsb <there-y@qq.com>
Date: Thu, 25 Apr 2024 15:48:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=88=86=E9=A1=B5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=A5=97=E9=A4=90=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/organ/OrganController.java           | 18 ++++++++++++++++--
 .../admin/organ/vo/organ/OrganRespVO.java      |  3 +++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java
index 7ec8e7c0d..a0d876718 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java
@@ -98,7 +98,10 @@ public class OrganController {
     @PreAuthorize("@ss.hasPermission('system:organ:query')")
     public CommonResult<OrganRespVO> getOrgan(@RequestParam("id") Long id) {
         OrganizationDO organ = organService.getOrgan(id);
-        return success(BeanUtils.toBean(organ, OrganRespVO.class));
+        TenantPackageDO tenantPackageDO = tenantPackageMapper.selectById(organ.getPackageId());
+        OrganRespVO bean = BeanUtils.toBean(organ, OrganRespVO.class);
+        bean.setPackageName(Objects.isNull(tenantPackageDO)? "": tenantPackageDO.getName());
+        return success(bean);
     }
 
     @GetMapping("/page")
@@ -106,7 +109,18 @@ public class OrganController {
     @PreAuthorize("@ss.hasPermission('system:organ:query')")
     public CommonResult<PageResult<OrganRespVO>> getOrganPage(@Valid OrganPageReqVO pageVO) {
         PageResult<OrganizationDO> pageResult = organService.getOrganPage(pageVO);
-        return success(BeanUtils.toBean(pageResult, OrganRespVO.class));
+        PageResult<OrganRespVO> bean = BeanUtils.toBean(pageResult, OrganRespVO.class);
+        Set<Long> packageIds = bean.getList().stream().map(OrganRespVO::getPackageId).collect(Collectors.toSet());
+        List<TenantPackageDO> tenantPackageDOS = tenantPackageMapper.selectBatchIds(packageIds);
+        bean.getList().forEach(e->{
+            e.setPackageName(tenantPackageDOS.stream()
+                    .filter(f->Objects.equals(f.getId(), e.getPackageId()))
+                    .map(TenantPackageDO::getName)
+                    .findAny()
+                    .orElse("")
+            );
+        });
+        return success(bean);
     }
 
     @GetMapping("/export-excel")
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganRespVO.java
index d9eaa09de..8f1ed2ed6 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganRespVO.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganRespVO.java
@@ -42,6 +42,9 @@ public class OrganRespVO {
     @Schema(description = "组织套餐编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long packageId;
 
+    @Schema(description = "组织套餐名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private String packageName;
+
     @Schema(description = "过期时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime expireTime;