From 1679c60a7aab473a9d6b876c5e507a023feb6e81 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 08 Apr 2020 09:55:00 +0800
Subject: [PATCH] 修改   添加  修改样式

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java |   15 ++++++++++++++-
 1 files changed, 14 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..bcb4b7c 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);
@@ -272,4 +279,10 @@
         }
         return sysUserExcels;
     }
+
+    @Override
+    public ResultBody findAll(Map<String, Object> map) {
+        List<SysUser> sysUsers = baseMapper.selectByMap(map);
+        return ResultBody.ok().data(sysUsers).msg("操作成功");
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0