zkr/shz-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新：1.获取用户信息返回用户类型；2.政策列表处理政策标签；3.岗位列表添加查询条件等。

Browse Source
This commit is contained in:
chenyanchang
2026-06-12 15:49:57 +08:00
parent f95981ed08
commit 27f3dc4730
4 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
View File

@@ -5,6 +5,8 @@ import java.util.Set;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.cms.domain.IDCardInfo;
import com.ruoyi.cms.service.impl.AppUserServiceImpl;
import com.ruoyi.common.core.domain.entity.AppUser;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.tymh.wwToken.WwTokenResult;
import com.ruoyi.common.core.domain.entity.tymh.wwToken.WwUserLogin;
@@ -45,6 +47,9 @@ public class SysLoginController
private OauthLoginHlwService oauthLoginHlwService;
@Autowired
private SsoService ssoService;
@Autowired
private AppUserServiceImpl appUserService;
/**
* 登录方法
*
@@ -165,8 +170,17 @@ public class SysLoginController
Set<String> roles = permissionService.getRolePermission(user);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(user);
//获取相关联的appUser的用户类型
String userType = null;
if (user != null && user.getAppUserId() != null) {
AppUser appUser = appUserService.selectAppUserByUserId(user.getAppUserId());
if (appUser != null) {
userType = appUser.getUserType();
}
}
AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
ajax.put("userType", userType);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
return ajax;