From edcf4df44f8a9b9a02bc4cc09669c057f72f9e59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 24 Apr 2025 22:01:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=80=A0=EF=BC=9AgetAdminsByPhone?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/MainController.java     | 24 +++++++++++++++----
 .../system/controller/TenantController.java   |  4 ++++
 .../common/system/mapper/UserMapper.java      |  2 +-
 .../common/system/mapper/xml/UserMapper.xml   | 15 +++++++++---
 .../common/system/service/UserService.java    |  2 +-
 .../system/service/impl/UserServiceImpl.java  |  9 +++----
 .../oa/mapper/xml/OaAssetsMapper.xml          |  1 +
 7 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
index a78557a..3b8b07f 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
@@ -643,7 +643,11 @@ public class MainController extends BaseController {
       throw new BusinessException("验证码不正确");
     }
     // 注册管理员
-    if (userService.getAdminByPhone(phone) != null) {
+    final UserParam param = new UserParam();
+    param.setPhone(phone);
+    param.setTemplateId(user.getTemplateId());
+    param.setIsAdmin(true);
+    if (userService.getAdminByPhone(param) != null) {
       throw new BusinessException("该手机号码已注册");
     }
     // 添加租户
@@ -665,7 +669,11 @@ public class MainController extends BaseController {
     company.setTenantId(tenant.getTenantId());
     company.setTemplateId(user.getTemplateId());
     tenantService.initialization(company);
-    final User adminByPhone = userService.getAdminByPhone(phone);
+    final UserParam userParam = new UserParam();
+    userParam.setIsAdmin(true);
+    userParam.setPhone(phone);
+    userParam.setTemplateId(user.getTemplateId());
+    final User adminByPhone = userService.getAdminByPhone(userParam);
 
     // 设置过期时间
     Long tokenExpireTime = configProperties.getTokenExpireTime();
@@ -785,7 +793,11 @@ public class MainController extends BaseController {
       throw new BusinessException("验证码不正确");
     }
     // 注册管理员
-    if (userService.getAdminByPhone(phone) != null) {
+    final UserParam param = new UserParam();
+    param.setPhone(phone);
+    param.setIsAdmin(true);
+    param.setTemplateId(user.getTemplateId());
+    if (userService.getAdminByPhone(param) != null) {
       throw new BusinessException("该手机号码已注册");
     }
     // 添加租户
@@ -821,7 +833,11 @@ public class MainController extends BaseController {
     }
     final Company addCompany = tenantService.initialization(company);
     if (ObjectUtil.isNotEmpty(addCompany)) {
-      final User adminByPhone = userService.getAdminByPhone(phone);
+      final UserParam userParam1 = new UserParam();
+      userParam1.setIsAdmin(true);
+      userParam1.setPhone(phone);
+      userParam1.setTemplateId(user.getTemplateId());
+      final User adminByPhone = userService.getAdminByPhone(userParam1);
 
       // 设置过期时间
       Long tokenExpireTime = configProperties.getTokenExpireTime();
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 da661ae..0fe3ea0 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java
@@ -112,6 +112,10 @@ public class TenantController extends BaseController {
   @ApiOperation("修改租户")
   @PutMapping()
   public ApiResult<?> update(@RequestBody Tenant tenant) {
+    final User loginUser = getLoginUser();
+    if(loginUser != null){
+      tenant.setTenantId(loginUser.getTenantId());
+    }
     if (tenantService.updateById(tenant)) {
       return success("修改成功");
     }
diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java
index 6dfeb8a..63a3fc2 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java
@@ -55,7 +55,7 @@ public interface UserMapper extends BaseMapper<User> {
     void updateByUserId(@Param("param") User param);
 
     @InterceptorIgnore(tenantLine = "true")
-    User selectAdminByPhone(@Param("phone") String phone);
+    User selectAdminByPhone(@Param("param") UserParam param);
 
     @InterceptorIgnore(tenantLine = "true")
     User selectByUserId(@Param("userId") Integer userId);
diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
index 5aa4c52..256f474 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
@@ -294,14 +294,23 @@
     FROM sys_user a
     <where>
       AND a.deleted = 0
-      AND a.phone = #{phone}
+      AND a.phone = #{param.phone}
+      AND a.template_id = #{param.templateId}
       AND (a.username = 'superAdmin' OR a.username = 'admin' OR a.is_admin = 1)
+      LIMIT 1
     </where>
   </select>
 
   <select id="selectListAllRel" resultType="com.gxwebsoft.common.system.entity.User">
-    <include refid="selectSql"></include>
-    LIMIT 50
+    SELECT a.*
+    FROM sys_user a
+    <where>
+      AND a.phone = #{param.phone}
+      AND a.template_id = #{param.templateId}
+      AND a.is_admin = 1
+      AND a.deleted = 0
+      LIMIT 1
+    </where>
   </select>
 
   <select id="pageRelAll" resultType="com.gxwebsoft.common.system.entity.User">
diff --git a/src/main/java/com/gxwebsoft/common/system/service/UserService.java b/src/main/java/com/gxwebsoft/common/system/service/UserService.java
index bcb648e..79b377e 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/UserService.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/UserService.java
@@ -112,7 +112,7 @@ public interface UserService extends IService<User>, UserDetailsService {
 
     User addUser(UserParam userParam);
 
-    User getAdminByPhone(String phone);
+    User getAdminByPhone(UserParam param);
 
     Integer userNumInPark(UserParam param);
 
diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
index 913e39c..9ff9868 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
@@ -270,8 +270,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     }
 
     @Override
-    public User getAdminByPhone(String phone) {
-      return baseMapper.selectAdminByPhone(phone);
+    public User getAdminByPhone(UserParam param) {
+      System.out.println("param222 = " + param);
+      return baseMapper.selectAdminByPhone(param);
     }
 
     @Override
@@ -279,10 +280,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
       final UserParam userParam = new UserParam();
       userParam.setPhone(param.getPhone());
       userParam.setIsAdmin(true);
-      userParam.setLimit(50L);
-      if(param.getTenantId() != null){
-        userParam.setTenantId(param.getTenantId());
-      }
       if(param.getTemplateId() != null){
         userParam.setTemplateId(param.getTemplateId());
       }
diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/OaAssetsMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/OaAssetsMapper.xml
index aa67835..d176106 100644
--- a/src/main/java/com/gxwebsoft/oa/mapper/xml/OaAssetsMapper.xml
+++ b/src/main/java/com/gxwebsoft/oa/mapper/xml/OaAssetsMapper.xml
@@ -128,6 +128,7 @@
             <if test="param.keywords != null">
               AND (a.tenant_id = #{param.keywords}
                   OR a.name LIKE CONCAT('%', #{param.keywords}, '%')
+                  OR a.code LIKE CONCAT('%', #{param.keywords}, '%')
               )
             </if>
         </where>