renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【登录】安眼统一认证

Browse Source
This commit is contained in:
pengjie
2025-10-31 17:42:53 +08:00
parent 5baa1b5479
commit c3d68906ab
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/LoginAnYanServiceImpl.java
+4 -1
View File
@@ -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);
jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+2 -7
View File
@@ -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))
queryWrapper.eq(SysUser::getUsername, username)
.or()
.eq(SysUser::getWorkNo, LoginUtils.getShortWorkNo(username));
}
.eq(SysUser::getWorkNo, username);
// all user
List<SysUser> list = list(queryWrapper);
if (CollectionUtils.isEmpty(list)) {