From 4e1448f31c75ae2baecbf497dfd11cce86914771 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sun, 26 Apr 2020 09:45:16 +0800
Subject: [PATCH] 添加  医生的控制权限

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java |   31 ++++++++++---------------------
 1 files changed, 10 insertions(+), 21 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 a5cdc88..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
@@ -60,30 +60,14 @@
     @Autowired
     private RedisUtils redisUtils;
     @Autowired
-    private SysRoleOrganizationMapper sysRoleOrganizationMapper;
-    @Autowired
-    private SysRoleMapper sysRoleMapper;
+    private SysRoleOrganizationServiceImpl SysRoleOrganizationServiceImpl;
+
 
     @Override
     public PageResult<SysDoctorVo> findList(Map<String, Object> params, SysUser user) {
         Page<SysDoctor> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
-        List<SysRole> roles = user.getRoles();
-        List<Map<SysRole,List<SysRoleOrganization>>> listroleOrg=new ArrayList<>();
-        if (!roles.isEmpty()) {
-            roles.forEach(e->{
-                Map<SysRole,List<SysRoleOrganization>> rolemap=new HashMap<>();
-                Map<String,Object> map=new HashMap<>();
-                map.put("role_id",e.getId());
-                List<SysRoleOrganization> sysRoleOrganizations = sysRoleOrganizationMapper.selectByMap(map);
-                if(sysRoleOrganizations.size()>0){
-                    SysRole sysRole = sysRoleMapper.selectById(e.getId());
-                    rolemap.put(sysRole,sysRoleOrganizations);
-                    listroleOrg.add(rolemap);
-                }
-            });
-        }
-
-        params.put("likes",listroleOrg);
+        //添加权限
+        SysRoleOrganizationServiceImpl.getRoleOrg(params, user);
         List<SysDoctor> list = baseMapper.findList(page, params);
         List<SysDoctorVo> listvo = new ArrayList<>();
         list.forEach(e -> {
@@ -147,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;
@@ -174,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