1.修改增加运营平台首页查看数据的角色值 2.修改部分角色的数据范围为空时的报错。

houruijun

2020-10-09 07b3293fd92ee47c1db4d82de36ff3714a1da98e

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

@@ -326,15 +326,13 @@
        Page<SysUser> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
        List<SysUser> list = baseMapper.findList(page, params);
        long total = page.getTotal();
        if (total > 0) {
        if (total > 0&&list.size()>0) {
            List<Long> userIds = list.stream().map(SysUser::getId).collect(Collectors.toList());

            List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds);

//            Map<String, Object> map = new HashMap<String, Object>();
//            List<SysOrganization> sysOrganizationList=organizationService.fin();
            list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId()))
                    .collect(Collectors.toList())));
            if (userIds.size()>0) {
                List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds);
                list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId()))
                        .collect(Collectors.toList())));
            }
        }
        return PageResult.<SysUser>builder().data(list).code(0).count(total).build();
    }
@@ -835,7 +833,11 @@
                            //创建字典数据
                            sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK);
                            //将名称汉字转为拼音
                            sysDictionaries.setDictionariesKey(Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(), true)));
                            String keyStr=Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(), true));
                            if (keyStr.length()>50) {
                                keyStr=keyStr.substring(0,49);
                            }
                            sysDictionaries.setDictionariesKey(keyStr);
                            sysDictionaries.setDictionariesName(userRegVo.getDoctorRank());
                            sysDictionaries.setCreateUserId(createUserId);
                            sysDictionaries.setCreateUserName(createUserName);