From c3d68906ab297b656d662b04e66872eb574f2312 Mon Sep 17 00:00:00 2001 From: PengJ <2413927716@qq.com> Date: Fri, 31 Oct 2025 17:42:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=99=BB=E5=BD=95=E3=80=91=E5=AE=89?= =?UTF-8?q?=E7=9C=BC=E7=BB=9F=E4=B8=80=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LoginAnYanServiceImpl.java | 5 +++- .../service/impl/SysUserServiceImpl.java | 25 ++++++++----------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/LoginAnYanServiceImpl.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/LoginAnYanServiceImpl.java index 3040059..73a15c8 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/LoginAnYanServiceImpl.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/LoginAnYanServiceImpl.java @@ -166,7 +166,10 @@ public class LoginAnYanServiceImpl implements ILoginAnYanService { */ private void checkUserAndUpdate(AnYanUserInfoResult anYanUserInfo, String password) { List list = sysUserService.list(new LambdaQueryWrapper() - .eq(SysUser::getWorkNo, anYanUserInfo.getEmployeeUnitDTO().getEmployeeNum()) + .and(wrapper -> + wrapper.eq(SysUser::getWorkNo, anYanUserInfo.getEmployeeUnitDTO().getEmployeeNum()) + .or().eq(SysUser::getUsername, anYanUserInfo.getEmployeeUnitDTO().getEmployeeNum()) + ) ); AnYanUserInfoResult.EmployeeUnitDTO employeeUnitDTO = anYanUserInfo.getEmployeeUnitDTO(); String departId = checkDepartAndUpdate(employeeUnitDTO); diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index e819ccf..33365bf 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -1555,15 +1555,15 @@ public class SysUserServiceImpl extends ServiceImpl impl userMapper.updateUserOrgCode(user.getId(), orgCode); } //处理用户角色 - if(StrUtil.isNotEmpty(sysUserModel.getUserRoleCode())){ + if (StrUtil.isNotEmpty(sysUserModel.getUserRoleCode())) { LambdaQueryWrapper roleWrapper = new LambdaQueryWrapper<>(); - roleWrapper.eq(SysRole::getRoleCode,sysUserModel.getUserRoleCode()); - SysRole sysRole = sysRoleMapper.selectOne(roleWrapper,false); - if(null != sysRole){ + roleWrapper.eq(SysRole::getRoleCode, sysUserModel.getUserRoleCode()); + SysRole sysRole = sysRoleMapper.selectOne(roleWrapper, false); + if (null != sysRole) { LambdaQueryWrapper sysUserRoleWrapper = new LambdaQueryWrapper<>(); - sysUserRoleWrapper.eq(SysUserRole::getUserId,user.getId()); - sysUserRoleWrapper.eq(SysUserRole::getRoleId,sysRole.getId()); - if(!sysUserRoleMapper.exists(sysUserRoleWrapper)){ + sysUserRoleWrapper.eq(SysUserRole::getUserId, user.getId()); + sysUserRoleWrapper.eq(SysUserRole::getRoleId, sysRole.getId()); + if (!sysUserRoleMapper.exists(sysUserRoleWrapper)) { SysUserRole sysUserRole = new SysUserRole(); sysUserRole.setRoleId(sysRole.getId()); sysUserRole.setUserId(user.getId()); @@ -2016,14 +2016,9 @@ public class SysUserServiceImpl extends ServiceImpl impl if (CollUtil.isNotEmpty(personTypes)) { queryWrapper.in(SysUser::getPersonType, personTypes); } - queryWrapper.eq(SysUser::getUsername, username); - // 处理工号 - if (LoginUtils.isWorkNo(username)) { - queryWrapper.or() - .eq(SysUser::getWorkNo, LoginUtils.getFullWorkNo(username)) - .or() - .eq(SysUser::getWorkNo, LoginUtils.getShortWorkNo(username)); - } + queryWrapper.eq(SysUser::getUsername, username) + .or() + .eq(SysUser::getWorkNo, username); // all user List list = list(queryWrapper); if (CollectionUtils.isEmpty(list)) {