Merge branch 'dev'

zhaoxiaohao

2020-11-04 8ea75b6f027f18f6daf229e43928f78b49740f79

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

@@ -107,7 +107,11 @@
    @Override
    public LoginAppUser findByOpenId(String username) {
        SysUser sysUser = this.selectByOpenId(username);
        return getLoginAppUser(sysUser);
        if (sysUser == null) {
            return null;
        } else {
            return getLoginAppUser(sysUser);
        }
    }

    @Override
@@ -124,6 +128,7 @@
     */
    @Override
    public LoginAppUser getLoginAppUser(SysUser sysUserNew) {
        log.error(sysUserNew.toString());
        LoginAppUser loginAppUser = new LoginAppUser();
        SysUser sysUser = this.baseMapper.selectById(sysUserNew);
        if (sysUser != null) {
@@ -138,7 +143,6 @@
            List<SysRole> sysRoles = roleUserService.findRolesByUserId(sysUser.getId());
            // 设置角色
            loginAppUser.setRoles(sysRoles);

            if (!CollectionUtils.isEmpty(sysRoles)) {
                Set<Long> roleIds = sysRoles.parallelStream().map(SuperEntity::getId).collect(Collectors.toSet());
                List<SysMenu> menus = roleMenuMapper.findMenusByRoleIds(roleIds, CommonConstant.PERMISSION);
@@ -149,7 +153,6 @@
                    loginAppUser.setPermissions(permissions);
                }
            }

            //医院信息
            DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId());
            if (doctorUserAllVo != null) {
@@ -701,6 +704,7 @@
                sysOrganizationH.setCreateUserId(createUserId);
                sysOrganizationH.setCreateUserName(createUserName);
                if (organizationService.save(sysOrganizationH)) {
                    organizationHos=sysOrganizationH.getId();
                    //写科室组织数据
                    SysOrganization sysOrganizationD = new SysOrganization();
                    sysOrganizationD.setOrgLevel(2);
@@ -710,6 +714,7 @@
                    sysOrganizationD.setCreateUserId(createUserId);
                    sysOrganizationD.setCreateUserName(createUserName);
                    if (organizationService.save(sysOrganizationD)) {
                        organizationDep=sysOrganizationD.getId();
                        //写医院组织数据
                        SysHospital sysHospital = new SysHospital();
                        sysHospital.setHospitalName(userRegVo.getHospitalName());
@@ -849,6 +854,10 @@

                        if (dicBool) {
                            //写用户组织关系表
                            SysHospital byId = hospitalService.getById(userRegVo.getHospitalId());
                            if(byId!=null){
                                organizationHos=byId.getOrgId();
                            }
                            List<SysUserOrg> sysUserOrgList = new ArrayList<SysUserOrg>();
                            sysUserOrgH.setUserId(sysUser.getId());
                            sysUserOrgH.setOrgId(organizationHos);
@@ -857,7 +866,10 @@
                            sysUserOrgH.setCreateUserId(isReg ? createUserId : sysUserd.getId());
                            sysUserOrgH.setCreateUserName(isReg ? createUserName : sysUserd.getUsername());
                            sysUserOrgList.add(sysUserOrgH);

                            SysDepartment department = departmentService.getById(userRegVo.getDepartmentId());
                            if(department!=null){
                                organizationDep=department.getOrgId();
                            }
                            sysUserOrgD.setUserId(sysUser.getId());
                            sysUserOrgD.setOrgId(organizationDep);
                            sysUserOrgD.setFromId(userRegVo.getDepartmentId());