From 8f9dba748594660d3b4512ebfb07bddf9f61c9f8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 28 二月 2025 13:44:50 +0800
Subject: [PATCH] 审批流定时任务

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 ad65a32..dd19d51 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
@@ -73,6 +73,9 @@
     @ApiOperation(value = "添加租户")
     @PostMapping(value = "/add")
     public R<Boolean> add(@Validated @RequestBody TTenantDTO dto) {
+        if(tenantService.isExit(dto)){
+            return R.fail("该账号已存在");
+        }
         // 密码加密
         dto.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
         return R.ok(tenantService.save(dto));
@@ -86,6 +89,9 @@
     @ApiOperation(value = "修改租户")
     @PostMapping(value = "/update")
     public R<Boolean> update(@Validated @RequestBody TTenantDTO dto) {
+        if(tenantService.isExit(dto)){
+            return R.fail("该账号已存在");
+        }
         // 密码加密
         if(StringUtils.isNotBlank(dto.getPassword())){
             dto.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
@@ -101,8 +107,8 @@
     @GetMapping(value = "/getDetailById")
     public R<TTenant> getDetailById(@RequestParam String 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()):"");
+//        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);
     }
 

--
Gitblit v1.7.1