diff --git a/core/backend/src/main/java/io/dataease/controller/sys/SysUserController.java b/core/backend/src/main/java/io/dataease/controller/sys/SysUserController.java index c7df61462d..11c5727e90 100644 --- a/core/backend/src/main/java/io/dataease/controller/sys/SysUserController.java +++ b/core/backend/src/main/java/io/dataease/controller/sys/SysUserController.java @@ -17,10 +17,7 @@ import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; import io.dataease.controller.response.ExistLdapUser; -import io.dataease.controller.sys.request.SysUserCreateRequest; -import io.dataease.controller.sys.request.SysUserPwdRequest; -import io.dataease.controller.sys.request.SysUserStateRequest; -import io.dataease.controller.sys.request.UserGridRequest; +import io.dataease.controller.sys.request.*; import io.dataease.controller.sys.response.AuthBindDTO; import io.dataease.controller.sys.response.RoleUserItem; import io.dataease.controller.sys.response.SysUserGridResponse; @@ -70,6 +67,16 @@ public class SysUserController { @Resource private AuthUserService authUserService; + @ApiIgnore + @GetMapping("/transAccount") + public Long transAccount(@RequestBody TransAccountRequest request) { + String account = request.getAccount(); + if (StringUtils.isBlank(account)) { + DEException.throwException("account can not be null"); + } + return sysUserService.uidByAccount(account); + } + @ApiOperation("查询用户") @RequiresPermissions("user:read") @PostMapping("/userGrid/{goPage}/{pageSize}") diff --git a/core/backend/src/main/java/io/dataease/controller/sys/request/TransAccountRequest.java b/core/backend/src/main/java/io/dataease/controller/sys/request/TransAccountRequest.java new file mode 100644 index 0000000000..79adf740b1 --- /dev/null +++ b/core/backend/src/main/java/io/dataease/controller/sys/request/TransAccountRequest.java @@ -0,0 +1,11 @@ +package io.dataease.controller.sys.request; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class TransAccountRequest implements Serializable { + + private String account; +} diff --git a/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.java b/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.java index 2aca5a89cf..e48a87a87f 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.java +++ b/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.java @@ -11,4 +11,6 @@ public interface ExtSysUserMapper { List ldapUserNames(Integer from); String queryAdminEmail(); + + Long queryUserId(String username); } diff --git a/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.xml index 85318db4f7..e99cd9bee8 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.xml +++ b/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.xml @@ -106,4 +106,8 @@ from sys_user where user_id = 1 + + diff --git a/core/backend/src/main/java/io/dataease/service/sys/SysUserService.java b/core/backend/src/main/java/io/dataease/service/sys/SysUserService.java index 8c4442ac4d..e6a9442ccc 100644 --- a/core/backend/src/main/java/io/dataease/service/sys/SysUserService.java +++ b/core/backend/src/main/java/io/dataease/service/sys/SysUserService.java @@ -63,6 +63,10 @@ public class SysUserService { @Resource private AuthUserService authUserService; + public Long uidByAccount(String account) { + return extSysUserMapper.queryUserId(account); + } + public List query(UserGridRequest request) {