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 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> getOrganPage(@Valid OrganPageReqVO pageVO) { PageResult pageResult = organService.getOrganPage(pageVO); - return success(BeanUtils.toBean(pageResult, OrganRespVO.class)); + PageResult bean = BeanUtils.toBean(pageResult, OrganRespVO.class); + Set packageIds = bean.getList().stream().map(OrganRespVO::getPackageId).collect(Collectors.toSet()); + List 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;