From fe49dd6e019db896921d5def098cf7f5fd6a9022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 17 Dec 2019 16:44:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E6=96=87=E4=BB=B6=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=9C=B0=E5=9D=80=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/core/api/iservice/busi/ISysUserService.java | 3 +++ .../core/apiservice/serviceimpl/busi/SysUserService.java | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java index daeffa2..4957aee 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java @@ -252,6 +252,9 @@ public interface ISysUserService { @ApiOperation(value = "封装用户信息",notes = "封装用户列表分页信息") SessionUser packPageSessionUser(SessionUser sessionUser, SysUser user); + @ApiOperation(value = "封装用户信息",notes = "封装用户系统配置信息") + SessionUser packConfigSessionUser(SessionUser sessionUser, SysUser user); + /** * 根据id查询用户信息 * @param ids 用户id diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index dd6e954..fc365ef 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -126,7 +126,7 @@ public class SysUserService implements ISysUserService { throw new CredentialsException("用户不存在"); } packSessionUser(sessionUser, user, user.getUserType(),loginPlatform, languageCode,deviceId); - packPageSessionUser(sessionUser, user); + packConfigSessionUser(sessionUser, user); AuthUtil.setSessionUser(sessionUser); refreshUserLoginInformation(user.getId()); AuthUtil.online(sessionUser); @@ -639,6 +639,15 @@ public class SysUserService implements ISysUserService { } @Override + public SessionUser packConfigSessionUser(SessionUser sessionUser, SysUser user) { + packPageSessionUser(sessionUser, user); + String fileViewUrl = RedisUtilTool.getSysConfigStrVal(CommonConstWords.CONFIG_FILE_VIEW_URL, + CommonConstWords.CONFIG_FILE_VIEW_URL_DEFAULT); + sessionUser.setFileViewUrl(fileViewUrl); + return sessionUser; + } + + @Override public List findSysUserByIds(Long[] ids) { DdlPackBean ddlPackBean = new DdlPackBean(); DdlPreparedPack.getInPackArray(ids, "id", ddlPackBean);