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

luliqiang

2020-07-12 9140edf9b115a6b38c599878093d595ef84228f1

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

@@ -29,6 +29,7 @@

import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.stream.Collectors;

/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -62,8 +63,10 @@
    private SysRoleMapper sysRoleMapper;
    @Autowired
    private SysUserRoleMapper sysUserRoleMapper;
    @Autowired
    private SysUserServiceImpl sysUserServiceImpl;

    private final String HOSPITAL_ADMIN="hospital_admin";
//    private final String HOSPITAL_ADMIN="hospital_admin";

    @Override
    public PageResult<SysDoctorVo> findList(Map<String, Object> params, SysUser user) {
@@ -146,11 +149,51 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean saveOrUpdateSer(SysDoctorDto sysDoctor, HttpServletRequest request,SysUser user) {
    public ResultBody saveOrUpdateSer(SysDoctorDto sysDoctor, HttpServletRequest request,SysUser user) {
        String id = request.getHeader(SecurityConstants.USER_ID_HEADER);
        if(null==sysDoctor){
           return  false;
           return  ResultBody.failed("请填写信息");
        }else {
            if(sysDoctor.getRoles()==null||sysDoctor.getRoles().size()<=0){
                return  ResultBody.failed("选择一个角色");
            }
            /**
             * 限制管理员只有一个
             */

            Boolean flag=false;
            if(sysDoctor.getRoles().contains(CommonConstant.HOSPITAL_ADMIN_ID)){
                //查询一个部门下的所有医生
                QueryWrapper wrapper=new QueryWrapper();
                wrapper.eq("is_del",0);
                wrapper.eq("enabled",1);
                wrapper.eq("department_id",sysDoctor.getDepartmentId());
                List<SysDoctor> doctoerList = this.baseMapper.selectList(wrapper);
                if(doctoerList.size()>0){
                    //查询role——user
                    List<Long> collect = doctoerList.stream().map(e -> e.getUserId()).collect(Collectors.toList());
                    wrapper=new QueryWrapper();
                    wrapper.in("user_id",collect);
                    List<SysRoleUser>  list= this.sysUserRoleMapper.selectList(wrapper);

                    for (SysRoleUser sysRoleUser : list) {
                        if(sysRoleUser.getRoleId()==CommonConstant.HOSPITAL_ADMIN_ID){
                            flag=true;
                        }
                    }
                }
            }
            if(flag){
                return  ResultBody.failed("该部门已经有管理员");
            }
            /**
             * 限制只有创建医生的个数
             *
             */
         if(sysUserServiceImpl.departmetAccountsCount(sysDoctor.getDepartmentId())<=0){
             return ResultBody.failed("该部门创建人数已经达到上限");
         }
            Long departmentId = sysDoctor.getDepartmentId();
            if (sysDoctor.getId()==null) {
                //保存
                SysUser sysUser=new SysUser();
@@ -169,19 +212,19 @@
                }
                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){
//                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);
                sysDoctor.getRoles().forEach(e->{
                    SysRoleUser sysRoleUser=new SysRoleUser();
                    sysRoleUser.setRoleId(sysRole.getId());
                    sysRoleUser.setRoleId(e);
                    sysRoleUser.setUserId(sysUser.getId());
                    int insert = sysUserRoleMapper.insert(sysRoleUser);
                }
                });
                //保存doctor的数据
                SysDoctor sysDoc=new SysDoctor();
                BeanCopier beanCopier = BeanCopier.create(SysDoctorDto.class, SysDoctor.class, false);
@@ -229,7 +272,7 @@
                redisUtils.hset(RedisConstant.USER_ORGANIZATION, getOne.getUserId().toString(), sysUserOrg);
            }
        }
        return true;
        return ResultBody.ok();
    }

    @Override