From fd9a7355dcaa1da3f6cc8bd8ab4167685b14afe1 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Sun, 26 Apr 2020 21:19:36 +0800
Subject: [PATCH] 增加用户与组织关系配置功能
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
index 8d64181..bb8c0e4 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
@@ -1,10 +1,15 @@
package com.kidgrow.usercenter.service.impl;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.kidgrow.common.constant.SecurityConstants;
import com.kidgrow.common.model.*;
import com.kidgrow.redis.util.RedisConstant;
import com.kidgrow.redis.util.RedisUtils;
+import com.kidgrow.usercenter.mapper.SysRoleMapper;
+import com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper;
+import com.kidgrow.usercenter.model.SysRoleOrganization;
+import com.kidgrow.usercenter.service.ISysRoleOrganizationService;
import com.kidgrow.usercenter.service.ISysUserOrgService;
import com.kidgrow.usercenter.service.ISysUserService;
import com.kidgrow.usercenter.vo.SysDoctorDto;
@@ -53,11 +58,16 @@
@Autowired
private ISysUserOrgService sysUserOrgService;
@Autowired
- RedisUtils redisUtils;
+ private RedisUtils redisUtils;
+ @Autowired
+ private SysRoleOrganizationServiceImpl SysRoleOrganizationServiceImpl;
+
@Override
- public PageResult<SysDoctorVo> findList(Map<String, Object> params) {
+ public PageResult<SysDoctorVo> findList(Map<String, Object> params, SysUser user) {
Page<SysDoctor> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
+ //添加权限
+ SysRoleOrganizationServiceImpl.getRoleOrg(params, user);
List<SysDoctor> list = baseMapper.findList(page, params);
List<SysDoctorVo> listvo = new ArrayList<>();
list.forEach(e -> {
@@ -121,7 +131,7 @@
@Override
@Transactional
- public boolean saveOrUpdateSer(SysDoctorDto sysDoctor, HttpServletRequest request) {
+ public boolean saveOrUpdateSer(SysDoctorDto sysDoctor, HttpServletRequest request,SysUser user) {
String id = request.getHeader(SecurityConstants.USER_ID_HEADER);
if(null==sysDoctor){
return false;
@@ -148,6 +158,11 @@
BeanCopier beanCopier = BeanCopier.create(SysDoctorDto.class, SysDoctor.class, false);
beanCopier.copy(sysDoctor,sysDoc,null);
sysDoc.setUserId(sysUser.getId());
+ if(user.getOrganizations()!=null){
+ List<SysOrganization> organizations = user.getOrganizations();
+ sysDoc.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
+ }
+
baseMapper.insert(sysDoc);
//保存将sys_user_org
SysUserOrg sysUserOrg=new SysUserOrg();
--
Gitblit v1.8.0