|
@@ -51,10 +51,12 @@ public class ProjectLogServiceImpl extends ServiceImpl<IProjectLogMapper, Projec
|
|
List<String> list = JSONObject.parseObject(num, List.class);
|
|
List<String> list = JSONObject.parseObject(num, List.class);
|
|
numSet.addAll(list);
|
|
numSet.addAll(list);
|
|
}
|
|
}
|
|
- List<SceneVo> sceneVoList = sceneService.getListByNumList(new ArrayList<>(numSet));
|
|
|
|
HashMap<String,String> sceneNameMap = new HashMap<>();
|
|
HashMap<String,String> sceneNameMap = new HashMap<>();
|
|
- for (SceneVo sceneVo : sceneVoList) {
|
|
|
|
- sceneNameMap.put(sceneVo.getNum(),sceneVo.getSceneName());
|
|
|
|
|
|
+ if(numSet.size() >0){
|
|
|
|
+ List<SceneVo> sceneVoList = sceneService.getListByNumList(new ArrayList<>(numSet));
|
|
|
|
+ for (SceneVo sceneVo : sceneVoList) {
|
|
|
|
+ sceneNameMap.put(sceneVo.getNum(),sceneVo.getTitle());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
for (ProjectLog record : page.getRecords()) {
|
|
for (ProjectLog record : page.getRecords()) {
|