From b5d80f607c87f04a70d09a16f456612dab69aff9 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 27 Apr 2020 16:54:02 +0800
Subject: [PATCH] 添加获取真实姓名,修改医生的bug

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java |   40 +++++++++++++++++++++++++++++++++-------
 1 files changed, 33 insertions(+), 7 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 ddb172a..938e2b0 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
@@ -8,7 +8,9 @@
 import com.kidgrow.redis.util.RedisUtils;
 import com.kidgrow.usercenter.mapper.SysRoleMapper;
 import com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper;
+import com.kidgrow.usercenter.mapper.SysUserRoleMapper;
 import com.kidgrow.usercenter.model.SysRoleOrganization;
+import com.kidgrow.usercenter.model.SysRoleUser;
 import com.kidgrow.usercenter.service.ISysRoleOrganizationService;
 import com.kidgrow.usercenter.service.ISysUserOrgService;
 import com.kidgrow.usercenter.service.ISysUserService;
@@ -61,7 +63,12 @@
     private RedisUtils redisUtils;
     @Autowired
     private SysRoleOrganizationServiceImpl SysRoleOrganizationServiceImpl;
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+    @Autowired
+    private SysUserRoleMapper sysUserRoleMapper;
 
+    private final String HOSPITAL_ADMIN="hospital_admin";
 
     @Override
     public PageResult<SysDoctorVo> findList(Map<String, Object> params, SysUser user) {
@@ -113,15 +120,17 @@
     public ResultBody enable(Map<String, Object> params) {
         Long aLong = MapUtils.getLong(params,"id");
         SysDoctor sysDoctor = baseMapper.selectById(aLong);
+        Boolean enabled = MapUtils.getBoolean(params, "enabled");
         if (sysDoctor != null && sysDoctor.getUserId() != null) {
             SysUser byId = iSysUserService.getById(sysDoctor.getUserId());
             if(byId!=null){
-                byId.setEnabled(true);
+                byId.setEnabled(enabled);
                 iSysUserService.updateById(byId);
             }
         }
         if(sysDoctor!=null){
-            sysDoctor.setEnabled(true);
+
+            sysDoctor.setEnabled(enabled);
             baseMapper.updateById(sysDoctor);
         }else {
             return ResultBody.failed("禁用失败");
@@ -153,6 +162,20 @@
                     sysUser.setCreateUserName(byId.getUsername());
                 }
                 iSysUserService.save(sysUser);
+                //保存  角色信息
+                Map<String,Object> map= new HashMap<>();
+                map.put("code",HOSPITAL_ADMIN);
+                map.put("enabled",1);
+                map.put("is_del",0);
+                List<SysRole> sysRoles = sysRoleMapper.selectByMap(map);
+                if(sysRoles.size()>0){
+                    //保存一个角色
+                    SysRole sysRole = sysRoles.get(0);
+                    SysRoleUser sysRoleUser=new SysRoleUser();
+                    sysRoleUser.setRoleId(sysRole.getId());
+                    sysRoleUser.setUserId(sysUser.getId());
+                    int insert = sysUserRoleMapper.insert(sysRoleUser);
+                }
                 //保存doctor的数据
                 SysDoctor sysDoc=new SysDoctor();
                 BeanCopier beanCopier = BeanCopier.create(SysDoctorDto.class, SysDoctor.class, false);
@@ -167,17 +190,13 @@
                 //保存将sys_user_org 保存部门
                 SysUserOrg sysUserOrg=new SysUserOrg();
                 sysUserOrg.setUserId(sysUser.getId());
-                sysUserOrg.setEnabled(false);
                 sysUserOrg.setOrgId(sysDoctor.getDepartmentId());
-                sysUserOrg.setCreateTime(new Date());
                 //保存公司
                 sysUserOrgService.saveOrUpdate(sysUserOrg);
                 SysUserOrg sysGongsi=new SysUserOrg();
                 sysGongsi.setUserId(sysUser.getId());
-//                sysUser.setEnabled(false);
                 sysGongsi.setOrgId(sysDoctor.getHospitalId());
-//                sysUser.setCreateTime(new Date());
-                sysUserOrgService.saveOrUpdate(sysUserOrg);
+                sysUserOrgService.saveOrUpdate(sysGongsi);
                 //保存到Redis
                 boolean hset = redisUtils.hset(RedisConstant.USER_ORGANIZATION, sysUserOrg.getUserId().toString(), sysUserOrg);
             }else {
@@ -205,4 +224,11 @@
         }
         return true;
     }
+
+    @Override
+    public List<SysDoctor> findByMap(Map<String, Object> map) {
+        map.put("enabled",1);
+        map.put("is_del",0);
+        return baseMapper.selectByMap(map);
+    }
 }

--
Gitblit v1.8.0