yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新租户插入对租户ID和名称的判断

Browse Source
This commit is contained in:
panshuling321 2022-02-28 10:57:55 +08:00
parent 722b3b81ff
commit f063885765
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/controller/XhpcTenantController.java
View File

@ -73,7 +73,6 @@ public class XhpcTenantController extends BaseController {
@PatchMapping("/detail") @PatchMapping("/detail")
public R updateTenant(HttpServletRequest request, @RequestBody XhpcTenantDomain domain){ public R updateTenant(HttpServletRequest request, @RequestBody XhpcTenantDomain domain){
LoginUser loginUser = logUserUtils.getLogUser(request); LoginUser loginUser = logUserUtils.getLogUser(request);
domain.setCreateUser(loginUser.getUserid());
domain.setUpdateUser(loginUser.getUserid()); domain.setUpdateUser(loginUser.getUserid());
return R.ok(tenantService.updateTenantInfo(domain)); return R.ok(tenantService.updateTenantInfo(domain));
} }
@ -83,7 +82,6 @@ public class XhpcTenantController extends BaseController {
@PatchMapping("/config") @PatchMapping("/config")
public R updateTenantConfig(HttpServletRequest request, @RequestBody XhpcTenantDomain domain){ public R updateTenantConfig(HttpServletRequest request, @RequestBody XhpcTenantDomain domain){
LoginUser loginUser = logUserUtils.getLogUser(request); LoginUser loginUser = logUserUtils.getLogUser(request);
domain.setCreateUser(loginUser.getUserid());
domain.setUpdateUser(loginUser.getUserid()); domain.setUpdateUser(loginUser.getUserid());
return R.ok(tenantService.updateTenantConfig(domain)); return R.ok(tenantService.updateTenantConfig(domain));
} }
@ -93,7 +91,6 @@ public class XhpcTenantController extends BaseController {
@PatchMapping("/status") @PatchMapping("/status")
public R updateTenantStatus(HttpServletRequest request, @RequestBody XhpcTenantDomain domain){ public R updateTenantStatus(HttpServletRequest request, @RequestBody XhpcTenantDomain domain){
LoginUser loginUser = logUserUtils.getLogUser(request); LoginUser loginUser = logUserUtils.getLogUser(request);
domain.setCreateUser(loginUser.getUserid());
domain.setUpdateUser(loginUser.getUserid()); domain.setUpdateUser(loginUser.getUserid());
return R.ok(tenantService.updateTenantStatus(domain)); return R.ok(tenantService.updateTenantStatus(domain));
} }

2
xhpc-modules/xhpc-tenant/src/main/java/com/xhpc/tenant/mapper/XhpcTenantMapper.java
View File

@ -25,7 +25,7 @@ public interface XhpcTenantMapper {
XhpcTenantDomain selectByName(String tenantName); XhpcTenantDomain selectByName(String tenantName);
XhpcTenantDomain selectByPkOrName(String tenantId, String tenantName); XhpcTenantDomain selectByPkOrName(@Param("tenantId") String tenantId, @Param("tenantName") String tenantName);
int updateByPrimaryKeySelective(XhpcTenantDomain record); int updateByPrimaryKeySelective(XhpcTenantDomain record);

2
xhpc-modules/xhpc-tenant/src/main/resources/mapper/XhpcTenantMapper.xml
View File

@ -70,7 +70,7 @@
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from xhpc_tenant 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> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String"> <delete id="deleteByPrimaryKey" parameterType="java.lang.String">