From 96705b6638c2893516b3f54a64f6a1b865c4aa78 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 29 May 2019 22:10:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E5=99=A8DEMO=20=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/IPersonnelService.java | 3 +++ .../core/apiservice/controller/base/AuthController.java | 17 +++++++++++++++++ .../apiservice/controller/busi/PersonnelController.java | 2 +- .../apiservice/controller/busi/SysMenuController.java | 2 +- .../serviceimpl/busi/PersonnelServiceService.java | 10 ++++++++++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java index 33ea847..f873559 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java @@ -36,6 +36,9 @@ public interface IPersonnelService { @ApiOperation(value = "更新用户状态") void updateSysUserInfoStatus(Long userInfoId,Integer status); + @ApiOperation(value = "修改用户主组织信息") + void updateSysUserOrganize(Long userId, Long organizeId); + @ApiOperation(value = "删除账号信息") void deleteSysUser(Long[] userIdList,String userName); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index b372dfa..6512304 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java @@ -77,6 +77,23 @@ public class AuthController extends CoreBaseController { } } + + /** + * 获取登录用户信息 + * + * @return 处理结果 + */ + @GetMapping(value = "/get-user-organize") + @ApiOperation(value = "获取会话用户组织信息", notes = "获取当前登录用户账号详细信息") + public ResultBean getUserOrganize() { + LOGGER.info("获取用户信息...lang:{}", AuthUtil.getSessionAttribute("languageCode")); + try { + return new ResultBean(true, "", AuthUtil.getOrganize()); + } catch (ImppBusiException e) { + return new ResultBean(false, e.getErrorDetail() + "-[解决]" + e.getErrorSolution()); + } + } + /** * 获取登录用户功能权限信息 * diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index dbb5e2b..bb227c7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -625,7 +625,7 @@ public class PersonnelController extends CoreBaseController { // 会话工厂信息保存进Redis AuthUtil.setOrganize(organize); - + personnelService.updateSysUserOrganize(AuthUtil.getSessionUser().getUser().getId(),organize.getId()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(organize); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index 44309b8..d080548 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java @@ -306,7 +306,7 @@ public class SysMenuController extends CoreBaseController { ValidatorBean.checkNotNull(menu.getParentId(), "父级功能ID不能为空"); menu.setId(Long.parseLong(menu.getMenuCode())); - menu.setMenuSort(Integer.parseInt(menu.getMenuCode())); + menu.setMenuSort(10000); if (!map.containsKey(menu.getMenuCode())) { map.put(menu.getMenuCode(),menu); } else { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index 79c960c..359b0bd 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -113,6 +113,16 @@ public class PersonnelServiceService implements IPersonnelService { } @Override + public void updateSysUserOrganize(Long userId, Long organizeId) { + LOGGER.debug("平台账号 SysUser userId:{} organizeId",userId, organizeId); + SysUser user = userRDao.getById(userId); + if(user != null){ + user.setOrganizeId(organizeId); + userRDao.save(user); + } + } + + @Override @ApiOperation(value = "删除账号信息") public void deleteSysUser(Long[] userIdList,String userName) { LOGGER.debug("平台账号 SysUser userIdList:{}", userIdList);