From 1d87d61cb31912ae9f5856cbfe1d763b27156afe Mon Sep 17 00:00:00 2001 From: er <913652501@qq.com> Date: Fri, 03 Apr 2020 09:41:48 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java index 9df44c3..d6614aa 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java +++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java @@ -12,6 +12,7 @@ import com.kidgrow.usercenter.mapper.SysUserMapper; import com.kidgrow.usercenter.model.SysRoleUser; import com.kidgrow.usercenter.model.SysUserExcel; +import com.kidgrow.usercenter.service.ISysOrganizationService; import com.kidgrow.usercenter.service.ISysRoleUserService; import com.kidgrow.usercenter.service.ISysUserService; import lombok.extern.slf4j.Slf4j; @@ -51,6 +52,9 @@ @Resource private SysRoleMenuMapper roleMenuMapper; + @Autowired + private ISysOrganizationService organizationService; + @Autowired @@ -79,7 +83,10 @@ if (sysUser != null) { LoginAppUser loginAppUser = new LoginAppUser(); BeanUtils.copyProperties(sysUser, loginAppUser); - + //获取用户所属组织机构列表 + List<SysOrganization> sysOrganizations = organizationService.findListByUserId(sysUser.getId()); + //设置组织机构集合 + loginAppUser.setOrganizations(sysOrganizations); List<SysRole> sysRoles = roleUserService.findRolesByUserId(sysUser.getId()); // 设置角色 loginAppUser.setRoles(sysRoles); -- Gitblit v1.8.0