From ab85f48a408bb058511ed3992230f258975474d8 Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Mon, 22 Jun 2026 16:22:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gxwebsoft/common/system/entity/DictData.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/gxwebsoft/common/system/entity/DictData.java b/src/main/java/com/gxwebsoft/common/system/entity/DictData.java index a8d38e5..8d9390c 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/DictData.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/DictData.java @@ -34,6 +34,10 @@ public class DictData implements Serializable { @Schema(description = "字典数据名称") private String dictDataName; + @Schema(description = "字段类型") + @TableField(exist = false) + private String type; + @Schema(description = "字段名称") @TableField(exist = false) private String text; From a220b505e6e2ad3ab2bbb0220e5ab0fa049f07b8 Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Tue, 23 Jun 2026 17:13:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/MainController.java | 2 +- .../common/system/service/UserService.java | 2 ++ .../system/service/impl/UserServiceImpl.java | 22 +++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java index 5fce460..58649c2 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java @@ -160,7 +160,7 @@ public class MainController extends BaseController { } } // 当前租户登录(登录账号|手机号码|邮箱登录) - user = userService.getByUsername(username, tenantId); + user = userService.getByUsernamePhone(username, tenantId); } if (user == null) { diff --git a/src/main/java/com/gxwebsoft/common/system/service/UserService.java b/src/main/java/com/gxwebsoft/common/system/service/UserService.java index 3b765f5..58a3c31 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/UserService.java +++ b/src/main/java/com/gxwebsoft/common/system/service/UserService.java @@ -58,6 +58,8 @@ public interface UserService extends IService, UserDetailsService { */ User getByUsername(String username, Integer tenantId); + User getByUsernamePhone(String username, Integer tenantId); + /** * 添加用户 * diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java index 58077b2..ec73e60 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java @@ -110,6 +110,28 @@ public class UserServiceImpl extends ServiceImpl implements Us return user; } + @Override + public User getByUsernamePhone(String username, Integer tenantId) { + if (StrUtil.isBlank(username)) { + return null; + } + User user = getOne(new LambdaQueryWrapper() + .and(wrapper -> wrapper + .eq(User::getUsername, username) + .or() + .eq(User::getPhone, username)) + .eq(tenantId != null, User::getTenantId, tenantId) + .eq(User::getDeleted, 0) + .orderByDesc(User::getUserId) + .last("limit 1") + ); + if (user != null) { + user.setRoles(userRoleService.listByUserId(user.getUserId())); + user.setAuthorities(roleMenuService.listMenuByUserId(user.getUserId(), null)); + } + return user; + } + @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { return getByUsername(username); From fc98ee05097afc97ee1a6db6ef3d9d5486a93095 Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Tue, 23 Jun 2026 17:34:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gxwebsoft/common/system/controller/MainController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java index 58649c2..fadbbe1 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java @@ -149,6 +149,7 @@ public class MainController extends BaseController { // return success(message, new LoginResult(access_token, user)); // } // } + user = userService.getByUsernamePhone(username, tenantId); }else { // 判断图形验证码 if (!tenantId.equals(10159) && !tenantId.equals(10158)) {