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) { private void checkUserAndUpdate(AnYanUserInfoResult anYanUserInfo, String password) {
List<SysUser> list = sysUserService.list(new LambdaQueryWrapper<SysUser>() 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(); AnYanUserInfoResult.EmployeeUnitDTO employeeUnitDTO = anYanUserInfo.getEmployeeUnitDTO();
String departId = checkDepartAndUpdate(employeeUnitDTO); String departId = checkDepartAndUpdate(employeeUnitDTO);
jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+10 -15
View File
@@ -1555,15 +1555,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
userMapper.updateUserOrgCode(user.getId(), orgCode); userMapper.updateUserOrgCode(user.getId(), orgCode);
} }
//处理用户角色 //处理用户角色
if(StrUtil.isNotEmpty(sysUserModel.getUserRoleCode())){ if (StrUtil.isNotEmpty(sysUserModel.getUserRoleCode())) {
LambdaQueryWrapper<SysRole> roleWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysRole> roleWrapper = new LambdaQueryWrapper<>();
roleWrapper.eq(SysRole::getRoleCode,sysUserModel.getUserRoleCode()); roleWrapper.eq(SysRole::getRoleCode, sysUserModel.getUserRoleCode());
SysRole sysRole = sysRoleMapper.selectOne(roleWrapper,false); SysRole sysRole = sysRoleMapper.selectOne(roleWrapper, false);
if(null != sysRole){ if (null != sysRole) {
LambdaQueryWrapper<SysUserRole> sysUserRoleWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysUserRole> sysUserRoleWrapper = new LambdaQueryWrapper<>();
sysUserRoleWrapper.eq(SysUserRole::getUserId,user.getId()); sysUserRoleWrapper.eq(SysUserRole::getUserId, user.getId());
sysUserRoleWrapper.eq(SysUserRole::getRoleId,sysRole.getId()); sysUserRoleWrapper.eq(SysUserRole::getRoleId, sysRole.getId());
if(!sysUserRoleMapper.exists(sysUserRoleWrapper)){ if (!sysUserRoleMapper.exists(sysUserRoleWrapper)) {
SysUserRole sysUserRole = new SysUserRole(); SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setRoleId(sysRole.getId()); sysUserRole.setRoleId(sysRole.getId());
sysUserRole.setUserId(user.getId()); sysUserRole.setUserId(user.getId());
@@ -2016,14 +2016,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
if (CollUtil.isNotEmpty(personTypes)) { if (CollUtil.isNotEmpty(personTypes)) {
queryWrapper.in(SysUser::getPersonType, personTypes); queryWrapper.in(SysUser::getPersonType, personTypes);
} }
queryWrapper.eq(SysUser::getUsername, username); queryWrapper.eq(SysUser::getUsername, username)
// 处理工号 .or()
if (LoginUtils.isWorkNo(username)) { .eq(SysUser::getWorkNo, username);
queryWrapper.or()
.eq(SysUser::getWorkNo, LoginUtils.getFullWorkNo(username))
.or()
.eq(SysUser::getWorkNo, LoginUtils.getShortWorkNo(username));
}
// all user // all user
List<SysUser> list = list(queryWrapper); List<SysUser> list = list(queryWrapper);
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {