From f063885765c5902529054aefcb613f5c20a55621 Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Mon, 28 Feb 2022 10:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A7=9F=E6=88=B7=E6=8F=92?=
 =?UTF-8?q?=E5=85=A5=E5=AF=B9=E7=A7=9F=E6=88=B7ID=E5=92=8C=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xhpc/tenant/controller/XhpcTenantController.java  | 3 ---
 .../src/main/java/com/xhpc/tenant/mapper/XhpcTenantMapper.java | 2 +-
 .../xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

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 3cbb6a32..d94753d8 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
@@ -73,7 +73,6 @@ public class XhpcTenantController extends BaseController {
     @PatchMapping("/detail")
     public R updateTenant(HttpServletRequest request, @RequestBody XhpcTenantDomain domain){
         LoginUser loginUser = logUserUtils.getLogUser(request);
-        domain.setCreateUser(loginUser.getUserid());
         domain.setUpdateUser(loginUser.getUserid());
         return R.ok(tenantService.updateTenantInfo(domain));
     }
@@ -83,7 +82,6 @@ public class XhpcTenantController extends BaseController {
     @PatchMapping("/config")
     public R updateTenantConfig(HttpServletRequest request, @RequestBody XhpcTenantDomain domain){
         LoginUser loginUser = logUserUtils.getLogUser(request);
-        domain.setCreateUser(loginUser.getUserid());
         domain.setUpdateUser(loginUser.getUserid());
         return R.ok(tenantService.updateTenantConfig(domain));
     }
@@ -93,7 +91,6 @@ public class XhpcTenantController extends BaseController {
     @PatchMapping("/status")
     public R updateTenantStatus(HttpServletRequest request, @RequestBody XhpcTenantDomain domain){
         LoginUser loginUser = logUserUtils.getLogUser(request);
-        domain.setCreateUser(loginUser.getUserid());
         domain.setUpdateUser(loginUser.getUserid());
         return R.ok(tenantService.updateTenantStatus(domain));
     }
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 33660193..09e3454b 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
@@ -25,7 +25,7 @@ public interface XhpcTenantMapper {
 
     XhpcTenantDomain selectByName(String tenantName);
 
-    XhpcTenantDomain selectByPkOrName(String tenantId, String tenantName);
+    XhpcTenantDomain selectByPkOrName(@Param("tenantId") String tenantId, @Param("tenantName") String tenantName);
 
     int updateByPrimaryKeySelective(XhpcTenantDomain record);
 
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 27d8b22e..03992b4a 100644
--- a/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml
+++ b/xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml
@@ -70,7 +70,7 @@
     select
     <include refid="Base_Column_List" />
     from xhpc_tenant
-    where tenant_id = #{tenantId,jdbcType=VARCHAR} OR tenant_name = #{tenantName,jdbcType=VARCHAR} limit 1
+    where tenant_id = #{tenantId,jdbcType=VARCHAR} or tenant_name = #{tenantName,jdbcType=VARCHAR} limit 1
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">