forked from kidgrow-microservices-platform

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,13 +158,25 @@
                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
                //保存将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);
                //保存到Redis
                boolean hset = redisUtils.hset(RedisConstant.USER_ORGANIZATION, sysUserOrg.getUserId().toString(), sysUserOrg);