From f78b7fee4794f036a16a25277e791168a1d32776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 20 Jan 2025 23:43:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E6=8E=A5=E5=8F=A3(=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E6=9D=83=E9=99=90)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/TenantController.java   | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java b/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java
index 51d0dee..83ccabe 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java
@@ -47,6 +47,8 @@ public class TenantController extends BaseController {
   private CompanyService companyService;
   @Resource
   private RedisUtil redisUtil;
+  @Resource
+  private UserService userService;
 
   @ApiOperation("分页查询租户")
   @GetMapping("/page")
@@ -189,23 +191,30 @@ public class TenantController extends BaseController {
   @ApiOperation("创建租户")
   @PostMapping("/saveByPhone")
   public ApiResult<?> saveByPhone(@RequestBody Tenant tenant) {
-    if (tenantService.count(new LambdaQueryWrapper<Tenant>().eq(Tenant::getTenantCode, tenant.getPhone())) > 0) {
-      return fail("租户编号已存在");
+    final String phone = tenant.getPhone();
+    if(tenant.getTenantName() == null){
+      return null;
+    }
+    if(tenant.getTenantCode() == null){
+      return null;
+    }
+    if (tenantService.count(new LambdaQueryWrapper<Tenant>().eq(Tenant::getTenantCode, phone)) > 0) {
+      return null;
     }
     if (tenantService.save(tenant)) {
       // 租户初始化
       final Company company = new Company();
       company.setDomain(tenant.getTenantId().toString().concat(".websoft.top"));
-      company.setEmail("");
-      company.setPhone(tenant.getPhone());
-      company.setPassword("");
+      company.setPhone(phone);
+      company.setEmail(null);
+      company.setPassword(userService.encodePassword(phone));
       company.setTid(tenant.getTenantId());
       company.setCompanyName(tenant.getTenantName());
       company.setShortName(tenant.getTenantName());
       company.setTenantId(tenant.getTenantId());
       tenantService.initialization(company);
-      return success("添加成功",tenant);
+      return success("创建成功");
     }
-    return fail("添加失败");
+    return null;
   }
 }