From 555e5b5fe33dd4d90980ec26c7a28fbf9286d799 Mon Sep 17 00:00:00 2001 From: hxh Date: Thu, 18 Jul 2024 10:39:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=89=80=E5=9C=A8=E8=A1=8C=E6=94=BF=E8=A7=84=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysLoginController.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java index 3a1e98ca..04a8d648 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java @@ -11,8 +11,11 @@ import com.kms.framework.manager.AsyncManager; import com.kms.framework.manager.factory.AsyncFactory; import com.kms.framework.web.service.SysPermissionService; import com.kms.framework.web.service.SysPermissionService.MenuDto; +import com.kms.system.domain.SysXzqh; +import com.kms.system.service.SysDeptService; import com.kms.system.service.SysMenuService; import com.kms.system.service.SysUserService; +import com.kms.system.service.SysXzqhService; import com.kms.web.utils.WaterRequestUtil; import com.kms.web.utils.WaterResultV2; import com.kms.web.utils.singleDomain.SingleMenu; @@ -20,6 +23,7 @@ import com.shuili.common.constant.Constants; import com.shuili.common.constant.YesOrNo; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.entity.SysDept; import com.shuili.common.core.domain.entity.SysMenu; import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.core.domain.model.LoginBody; @@ -70,6 +74,13 @@ public class SysLoginController extends BaseController { private SysUserService userService; @Autowired private RedisCache redisCache; + + @Autowired + private SysXzqhService sysXzqhService; + + @Autowired + private SysDeptService sysDeptService; + @Autowired WaterRequestUtil waterRequestUtil; @Value("${water.redirect:}") @@ -201,16 +212,30 @@ public class SysLoginController extends BaseController { @GetMapping("getInfo") public AjaxResult getInfo() { SysUser user = UserUtils.getUser(); + if (user == null) { + return AjaxResult.error("用户未登录"); + } // 角色集合 Set roles = permissionService.getRolePermission(user); // 权限集合 Set permissions = permissionService.getMenuPermission(user); AjaxResult ajax = AjaxResult.success(); + String cicd = ""; + String deptId = user.getDeptId(); + SysDept sysDept = sysDeptService.getById(deptId); + if (sysDept != null) { + String xzqhId = sysDept.getXzqhId(); + SysXzqh xzqh = sysXzqhService.getById(xzqhId); + if (xzqh != null) { + cicd = xzqh.getXzqhdm(); + } + } ajax.put("user", user); ajax.put("roles", roles); ajax.put("permissions", permissions); + ajax.put("cicd", cicd); // 判断是否需要展示创建索引按钮 return ajax;