Merge remote-tracking branch 'origin/dev' into dev

houruijun

2020-11-27 3ecb43bd5455df7c541d382370c981c4ffa24853

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java

@@ -190,17 +190,16 @@
                    return ResultBody.failed("选择一个角色");
                }
            }

            /**
             * 限制只有创建医生的个数
             *
             */
            if (sysUserServiceImpl.departmetAccountsCount(sysDoctor.getDepartmentId()) <= 0) {
                return ResultBody.failed("该部门创建人数已经达到上限");
            }
            SysHospital sysHospital = sysHospitalMapper.selectById(sysDoctor.getHospitalId());
            SysDepartment sysDepartment = sysDepartmentMapper.selectById(sysDoctor.getDepartmentId());
            if (sysDoctor.getId() == null) {
                /**
                 * 限制只有创建医生的个数
                 *
                 */
                if (sysUserServiceImpl.departmetAccountsCount(sysDoctor.getDepartmentId()) <= 0) {
                    return ResultBody.failed("该部门创建人数已经达到上限");
                }
                Long sysUserId = null;
                //保存部门信息
                ResultBody resultBody = this.saveFenjiekou(sysDoctor, id, sysHospital, sysDepartment, null);
@@ -246,12 +245,12 @@
                        }
                    }
                    Map<String, Object> columnMap = new HashMap<>();
                    columnMap.put("user_id", sysDoctor.getUserId());
                    columnMap.put("user_id", getOne.getUserId());
                    boolean b = sysUserOrgService.removeByMap(columnMap);
                    //保存将sys_user_org
                    SysUserOrg sysUserOrg = new SysUserOrg();
                    sysUserOrg.setUserId(getOne.getUserId());
                    sysUserOrg.setEnabled(false);
                    sysUserOrg.setEnabled(true);
                    sysUserOrg.setFromId(sysDoctor.getDepartmentId());
                    sysUserOrg.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL);
                    sysUserOrg.setOrgId(sysDepartment.getOrgId());
@@ -260,10 +259,12 @@
                    sysUserOrgs.add(sysUserOrg);
                    sysUserOrgService.saveOrUpdate(sysUserOrg);
                    SysUserOrg sysGongsi = new SysUserOrg();
                    sysGongsi.setUserId(getOne.getId());
                    sysGongsi.setUserId(getOne.getUserId());
                    sysGongsi.setOrgId(sysHospital.getOrgId());
                    sysGongsi.setFromId(sysDoctor.getHospitalId());
                    sysGongsi.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL);
                    sysGongsi.setFromLevel(CommonConstant.SYSTEM_ORG_HOS_LEVEL);
                    sysGongsi.setEnabled(true);
                    sysUserOrgs.add(sysGongsi);
                    sysUserOrgService.saveOrUpdate(sysGongsi);
                    baseMapper.updateById(sysDoctor);
                    if (redisUtils.hHasKey(RedisConstant.USER_ORGANIZATION, getOne.getUserId().toString())) {
@@ -417,13 +418,13 @@
                sysRoleUser.setUserId(sysUser.getId());
                int insert = sysUserRoleMapper.insert(sysRoleUser);
            });
            List<SysUserOrg> sysUserOrgs=new ArrayList<>();
            //保存将sys_user_org 保存部门
            SysUserOrg sysUserOrg = new SysUserOrg();
            sysUserOrg.setUserId(sysUser.getId());
            sysUserOrg.setFromId(sysDoctor.getDepartmentId());
            sysUserOrg.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL);
            sysUserOrg.setOrgId(sysDepartment.getOrgId());
            List<SysUserOrg> sysUserOrgs=new ArrayList<>();
            sysUserOrgs.add(sysUserOrg);
            //保存公司
            sysUserOrgService.saveOrUpdate(sysUserOrg);
@@ -433,6 +434,7 @@
            sysGongsi.setFromId(sysDoctor.getHospitalId());
            sysGongsi.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL);
            sysUserOrgService.saveOrUpdate(sysGongsi);
            sysUserOrgs.add(sysGongsi);
            //保存到Redis
            boolean hset = redisUtils.hset(RedisConstant.USER_ORGANIZATION, sysUserOrg.getUserId().toString(), sysUserOrgs);
        }