|
@@ -7,6 +7,7 @@ import com.zjugis.framework.operatelog.core.annotations.OperateLog;
|
|
|
import com.zjugis.framework.security.config.SecurityProperties;
|
|
|
import com.zjugis.module.system.controller.admin.auth.vo.*;
|
|
|
import com.zjugis.module.system.convert.auth.AuthConvert;
|
|
|
+import com.zjugis.module.system.dal.dataobject.dept.DeptDO;
|
|
|
import com.zjugis.module.system.dal.dataobject.permission.MenuDO;
|
|
|
import com.zjugis.module.system.dal.dataobject.permission.RoleDO;
|
|
|
import com.zjugis.module.system.dal.dataobject.user.AdminUserDO;
|
|
@@ -113,7 +114,9 @@ public class AuthController {
|
|
|
|
|
|
// 2. 拼接结果返回
|
|
|
AuthPermissionInfoRespVO authPermissionInfoRespVO = AuthConvert.INSTANCE.convert(user, roles, menuList);
|
|
|
- authPermissionInfoRespVO.getUser().setDeptName(deptService.getDept(user.getDeptId()).getName());
|
|
|
+ DeptDO dept = deptService.getDept(user.getDeptId());
|
|
|
+ authPermissionInfoRespVO.getUser().setDeptId(dept.getId());
|
|
|
+ authPermissionInfoRespVO.getUser().setDeptName(dept.getName());
|
|
|
return success(authPermissionInfoRespVO);
|
|
|
}
|
|
|
|