From d7238058ab474e5bfeb474903678b1e0cf8ad04e Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Thu, 24 Feb 2022 15:53:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xhpc/system/api/domain/SysUser.java  |  5 -----
 .../src/main/resources/mapper/system/SysUserMapper.xml |  2 --
 .../xhpc/tenant/controller/XhpcTenantController.java   | 10 ++++++++--
 .../java/com/xhpc/tenant/mapper/XhpcTenantMapper.java  |  2 ++
 .../com/xhpc/tenant/service/XhpcTenantService.java     |  5 ++++-
 .../tenant/service/impl/XhpcTenantServiceImpl.java     |  7 ++++++-
 .../src/main/resources/mapper/XhpcTenantMapper.xml     |  8 ++++++++
 7 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/domain/SysUser.java
index 7b5cf141..e82b745c 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/domain/SysUser.java
@@ -50,11 +50,6 @@ public class SysUser extends BaseEntity
      */
     private String tenantId;
 
-    /**
-     * 租户名称
-     */
-    private String tenantName;
-
     /**
      * 用户昵称
      */
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 5412687f..9488a1a1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -83,13 +83,11 @@
                r.status as role_status,
                u.user_type,
                u.tenant_id,
-               t.tenant_name,
                u.operator_id
         from sys_user u
                  left join sys_dept d on u.dept_id = d.dept_id
                  left join sys_user_role ur on u.user_id = ur.user_id
                  left join sys_role r on r.role_id = ur.role_id
-                inner join xhpc_tenant t on u.tenant_id=t.tenant_id and t.is_deleted=0 and t.status=1
     </sql>
 
     <select id="selectUserList" parameterType="com.xhpc.system.api.domain.SysUser" resultMap="SysUserResult">
diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/controller/XhpcTenantController.java b/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/controller/XhpcTenantController.java
index 85dd2533..3cbb6a32 100644
--- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/controller/XhpcTenantController.java
+++ b/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/controller/XhpcTenantController.java
@@ -10,7 +10,6 @@ import com.xhpc.common.util.LogUserUtils;
 import com.xhpc.system.api.model.LoginUser;
 import com.xhpc.tenant.domain.XhpcTenantDomain;
 import com.xhpc.tenant.service.XhpcTenantService;
-import org.apache.tools.ant.taskdefs.condition.Http;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -39,8 +38,15 @@ public class XhpcTenantController extends BaseController {
         params.put("tenantId", tenantId);
         params.put("tenantName", tenantName);
         params.put("contactName", contactName);
-        return getDataTable(tenantService.getList(params));
+        return getDataTable(tenantService.getPage(params));
     }
+
+
+    @GetMapping("/getNameList")
+    public R getNameList(){
+        return R.ok(tenantService.getNameList());
+    }
+
     // 到期前15填短信通知联系人
     // 1点定时更新状态
     //停用状态不能登陆PC，小程序正常
diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/mapper/XhpcTenantMapper.java b/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/mapper/XhpcTenantMapper.java
index 420e5143..eb2a8e38 100644
--- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/mapper/XhpcTenantMapper.java
+++ b/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/mapper/XhpcTenantMapper.java
@@ -11,6 +11,8 @@ public interface XhpcTenantMapper {
 
     List<XhpcTenantDomain> getList(@Param("params") Map params);
 
+    List<Map<String, Object>> getNameList();
+
     int deleteByPrimaryKey(String tenantId);
 
     int deleteLogicByPrimaryKey(String tenantId);
diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/XhpcTenantService.java b/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/XhpcTenantService.java
index 8357ff7f..762fa578 100644
--- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/XhpcTenantService.java
+++ b/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/XhpcTenantService.java
@@ -7,7 +7,10 @@ import java.util.Map;
 
 public interface XhpcTenantService {
 
-    List<XhpcTenantDomain> getList(Map<String, Object> params);
+    List<XhpcTenantDomain> getPage(Map<String, Object> params);
+
+
+    List<Map<String, Object>> getNameList();
 
     XhpcTenantDomain getInfoByPk(String tenantId);
 
diff --git a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/impl/XhpcTenantServiceImpl.java b/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/impl/XhpcTenantServiceImpl.java
index 7d6d6927..4a5a6bd5 100644
--- a/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/impl/XhpcTenantServiceImpl.java
+++ b/xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/service/impl/XhpcTenantServiceImpl.java
@@ -21,11 +21,16 @@ public class XhpcTenantServiceImpl implements XhpcTenantService {
 
 
     @Override
-    public List<XhpcTenantDomain> getList(Map<String, Object> params){
+    public List<XhpcTenantDomain> getPage(Map<String, Object> params){
         return tenantMapper.getList(params);
     }
 
 
+    @Override
+    public List<Map<String, Object>> getNameList(){
+        return tenantMapper.getNameList();
+    }
+
     @Override
     public XhpcTenantDomain getInfoByPk(String tenantId){
         return tenantMapper.selectByPrimaryKey(tenantId);
diff --git a/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml b/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml
index 524c4dc4..abe4f23c 100644
--- a/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml
+++ b/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml
@@ -26,6 +26,14 @@
     update_user, update_time, `status`, is_deleted
   </sql>
 
+  <select id="getNameList" resultType="map">
+    select
+        tenant_id as 'tenantId',
+        tenant_name as 'tenantName'
+    from xhpc_tenant where is_deleted=0 and status=1
+  </select>
+
+
   <select id="getList" resultType="com.xhpc.tenant.domain.XhpcTenantDomain">
     select
     <include refid="Base_Column_List" />