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 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