From eaf5199c2eee33f5add31d6dbe17d731eb9eab66 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Thu, 14 May 2020 16:23:48 +0800
Subject: [PATCH] 医生添加用户时， 用户名不能重复
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 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..2bdf1cd 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.constant.CommonConstant;
+import com.kidgrow.common.constant.SecurityConstants;
import com.kidgrow.common.context.ClientContextHolder;
import com.kidgrow.common.lock.DistributedLock;
import com.kidgrow.common.model.*;
@@ -12,7 +13,9 @@
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.ISysUserOrgService;
import com.kidgrow.usercenter.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
@@ -26,6 +29,7 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.stream.Collectors;
@@ -50,6 +54,11 @@
@Resource
private SysRoleMenuMapper roleMenuMapper;
+
+ @Autowired
+ private ISysOrganizationService organizationService;
+ @Autowired
+ private ISysUserOrgService iSysUserOrgService;
@@ -79,7 +88,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);
@@ -196,6 +208,9 @@
List<Long> userIds = list.stream().map(SysUser::getId).collect(Collectors.toList());
List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds);
+
+// Map<String, Object> map = new HashMap<String, Object>();
+// List<SysOrganization> sysOrganizationList=organizationService.fin();
list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId()))
.collect(Collectors.toList())));
}
@@ -272,4 +287,47 @@
}
return sysUserExcels;
}
+
+ @Override
+ public ResultBody findAll(Map<String, Object> map) {
+ List<SysUser> sysUsers = baseMapper.selectByMap(map);
+ return ResultBody.ok().data(sysUsers).msg("操作成功");
+ }
+
+ /**
+ * 获取当前用的 组织下的所有人员
+ * @param request
+ * @return
+ */
+ @Override
+ public ResultBody getThisUserOrganizationUser(HttpServletRequest request) {
+ String id = request.getHeader(SecurityConstants.USER_ID_HEADER);
+ List<SysUser> sysUsers=new ArrayList<>();
+ if(StringUtils.isNotBlank(id)){
+ QueryWrapper<SysUserOrg> queryWrapper=new QueryWrapper();
+ queryWrapper.eq("user_id",id);
+ List<SysUserOrg> list = iSysUserOrgService.list(queryWrapper);
+ if(list.size()>0){
+ List<Long> collect = list.stream().map(e -> e.getOrgId()).collect(Collectors.toList());
+ if (collect.size()>0) {
+ queryWrapper=new QueryWrapper<>();
+ queryWrapper.in("org_id",collect);
+ List<SysUserOrg> sysUserOrgs = iSysUserOrgService.list(queryWrapper);
+ List<Long> userIds = sysUserOrgs.stream().map(e -> e.getUserId()).collect(Collectors.toList());
+ QueryWrapper<SysUser> sysUserQueryWrapper=new QueryWrapper();
+ sysUserQueryWrapper.in("id",userIds.stream().distinct().collect(Collectors.toList()));
+ sysUsers= baseMapper.selectList(sysUserQueryWrapper);
+ }
+ }
+ }else {
+ return ResultBody.failed("暂无数据");
+ }
+ return ResultBody.ok().data(sysUsers);
+ }
+
+ @Override
+ public ResultBody findCountByMap(Map<String, Object> map) {
+ Integer integer = baseMapper.selectCountByMap(map);
+ return ResultBody.ok().data(integer);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0