From aa58b3614535ad7440f3df13e2cbebde83bccaf1 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Thu, 20 Jun 2024 22:52:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=B6=85=E7=AE=A1=E4=BB=8E?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=88=9B=E5=BB=BA=E7=A7=9F=E6=88=B7=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsh/erp/service/tenant/TenantService.java | 25 +++++++------------
 .../com/jsh/erp/service/user/UserService.java | 23 ++++++++++++++---
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java
index 60d0bd28..bbfe5f81 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java
@@ -44,11 +44,8 @@ public class TenantService {
     @Resource
     private LogService logService;
 
-    @Value("${tenant.userNumLimit}")
-    private Integer userNumLimit;
-
-    @Value("${tenant.tryDayLimit}")
-    private Integer tryDayLimit;
+    @Value("${manage.roleId}")
+    private Integer manageRoleId;
 
     public Tenant getTenant(long id)throws Exception {
         Tenant result=null;
@@ -103,18 +100,14 @@ public class TenantService {
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int insertTenant(JSONObject obj, HttpServletRequest request)throws Exception {
-        Tenant tenant = JSONObject.parseObject(obj.toJSONString(), Tenant.class);
-        int result=0;
+        UserEx ue = JSONObject.parseObject(obj.toJSONString(), UserEx.class);
+        int result = 0;
         try{
-            tenant.setCreateTime(new Date());
-            if(tenant.getUserNumLimit()==null) {
-                tenant.setUserNumLimit(userNumLimit); //默认用户限制数量
-            }
-            if(tenant.getExpireTime()==null) {
-                tenant.setExpireTime(Tools.addDays(new Date(), tryDayLimit)); //租户允许试用的天数
-            }
-            result = tenantMapper.insertSelective(tenant);
-        }catch(Exception e){
+            ue.setUsername(ue.getLoginName());
+            userService.checkLoginName(ue); //检查登录名
+            userService.registerUser(ue,manageRoleId,request);
+            result = 1;
+        } catch(Exception e){
             JshException.writeFail(logger, e);
         }
         return result;
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
index 8d81b1ac..03af2e59 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
@@ -1,6 +1,7 @@
 package com.jsh.erp.service.user;
 
 import com.jsh.erp.datasource.entities.*;
+import com.jsh.erp.datasource.mappers.TenantMapper;
 import com.jsh.erp.exception.BusinessParamCheckingException;
 import com.jsh.erp.service.functions.FunctionService;
 import com.jsh.erp.service.platformConfig.PlatformConfigService;
@@ -43,7 +44,8 @@ public class UserService {
 
     @Resource
     private UserMapper userMapper;
-
+    @Resource
+    private TenantMapper tenantMapper;
     @Resource
     private UserMapperEx userMapperEx;
     @Resource
@@ -65,6 +67,12 @@ public class UserService {
     @Resource
     private RedisService redisService;
 
+    @Value("${tenant.userNumLimit}")
+    private Integer userNumLimit;
+
+    @Value("${tenant.tryDayLimit}")
+    private Integer tryDayLimit;
+
     public User getUser(long id)throws Exception {
         User result=null;
         try{
@@ -585,9 +593,8 @@ public class UserService {
                 ue.setIsmanager(BusinessConstants.USER_NOT_MANAGER);
             }
             ue.setStatus(BusinessConstants.USER_STATUS_NORMAL);
-            int result=0;
             try{
-                result= userMapper.insertSelective(ue);
+                userMapper.insertSelective(ue);
                 Long userId = getIdByLoginName(ue.getLoginName());
                 ue.setId(userId);
             }catch(Exception e){
@@ -614,7 +621,15 @@ public class UserService {
             tenantObj.put("userNumLimit", ue.getUserNumLimit());
             tenantObj.put("expireTime", ue.getExpireTime());
             tenantObj.put("remark", ue.getRemark());
-            tenantService.insertTenant(tenantObj, request);
+            Tenant tenant = JSONObject.parseObject(tenantObj.toJSONString(), Tenant.class);
+            tenant.setCreateTime(new Date());
+            if(tenant.getUserNumLimit()==null) {
+                tenant.setUserNumLimit(userNumLimit); //默认用户限制数量
+            }
+            if(tenant.getExpireTime()==null) {
+                tenant.setExpireTime(Tools.addDays(new Date(), tryDayLimit)); //租户允许试用的天数
+            }
+            tenantMapper.insertSelective(tenant);
             logger.info("===============创建租户信息完成===============");
         }
     }