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<SysUser> list = sysUserService.list(new LambdaQueryWrapper<SysUser>()
-                .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<SysUserMapper, SysUser> impl
             userMapper.updateUserOrgCode(user.getId(), orgCode);
         }
         //处理用户角色
-        if(StrUtil.isNotEmpty(sysUserModel.getUserRoleCode())){
+        if (StrUtil.isNotEmpty(sysUserModel.getUserRoleCode())) {
             LambdaQueryWrapper<SysRole> 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<SysUserRole> 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<SysUserMapper, SysUser> 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<SysUser> list = list(queryWrapper);
         if (CollectionUtils.isEmpty(list)) {