|
@@ -71,6 +71,9 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
@Autowired
|
|
|
private LessonCoursewareService lessonCoursewareService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private SysUserService sysUserService;
|
|
|
+
|
|
|
@Resource
|
|
|
private CbsMusicScoreCategoriesService cbsMusicScoreCategoriesService;
|
|
|
@Lazy
|
|
@@ -1067,8 +1070,16 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
|
|
|
dataList.addAll(tops);
|
|
|
}
|
|
|
+ //dataList 转map
|
|
|
+ Map<Integer, MemberRankSetting> settingMap = dataList.stream().collect(Collectors.toMap(MemberRankSetting::getId, o -> o, (o1, o2) -> o1));
|
|
|
+
|
|
|
+
|
|
|
+ List<MemberRankSettingWrapper.MemberRankSetting> memberRankSettings = JSON.parseArray(JSON.toJSONString(settingMap.values()), MemberRankSettingWrapper.MemberRankSetting.class);
|
|
|
+
|
|
|
+ // 更新人ID集合
|
|
|
+ List<Integer> operatorIds = memberRankSettings.stream().map(o -> o.getOperator()).collect(Collectors.toList());
|
|
|
+ Map<Long, SysUser> sysUserMap = sysUserService.getMapByIds(operatorIds);
|
|
|
|
|
|
- List<MemberRankSettingWrapper.MemberRankSetting> memberRankSettings = JSON.parseArray(JSON.toJSONString(dataList), MemberRankSettingWrapper.MemberRankSetting.class);
|
|
|
|
|
|
// 设置曲目数量
|
|
|
// 查询曲目ID分类
|
|
@@ -1094,6 +1105,14 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
|
|
|
if (CollectionUtils.isNotEmpty(categoryList)) {
|
|
|
e.setMusicCount(categoryList.stream().map(statMap::get).filter(Objects::nonNull).reduce(Integer::sum).orElse(0));
|
|
|
}
|
|
|
+ SysUser sysUser = sysUserMap.get(e.getOperator().longValue());
|
|
|
+ if (sysUser != null) {
|
|
|
+ e.setOperatorName(sysUser.getRealName());
|
|
|
+ }
|
|
|
+ MemberRankSetting memberRankSetting = settingMap.get(e.getParentId());
|
|
|
+ if (memberRankSetting != null) {
|
|
|
+ e.setParentName(memberRankSetting.getName());
|
|
|
+ }
|
|
|
});
|
|
|
}
|
|
|
// 转tree
|