From becc3df6d06e9b0a6fd773229e99b4b2075b8043 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期一, 17 二月 2025 14:41:05 +0800 Subject: [PATCH] 资讯修改 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java index b2eeaaf..c9f0d94 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java @@ -3,12 +3,16 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.common.constant.DictConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.DictUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.dto.TTenantDTO; +import com.ruoyi.system.model.TContract; import com.ruoyi.system.model.TTenant; +import com.ruoyi.system.query.TContractQuery; import com.ruoyi.system.query.TTenantQuery; import com.ruoyi.system.service.TTenantService; import com.ruoyi.system.vo.TenantVO; @@ -85,9 +89,19 @@ @ApiOperation(value = "查看租户详情") @GetMapping(value = "/getDetailById") public R<TTenant> getDetailById(@RequestParam String id) { - return R.ok(tenantService.getById(id)); + TTenant tenant = tenantService.getById(id); + tenant.setTenantAttributes(StringUtils.isNotEmpty(tenant.getTenantAttributes())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_ATTRIBUTE,tenant.getTenantAttributes()):""); + tenant.setTenantType(StringUtils.isNotEmpty(tenant.getTenantType())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_TYPE,tenant.getTenantType()):""); + return R.ok(tenant); } +// @PreAuthorize("@ss.hasPermi('system:contract:list')") +// @ApiOperation(value = "获取合同分页列表") +// @PostMapping(value = "/contractList") +// public R<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) { +// return R.ok(contractService.contractList(query)); +// } + /** * 删除租户 */ -- Gitblit v1.7.1