|
@@ -315,8 +315,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
}
|
|
|
}
|
|
|
Page<SceneVo> page = null;
|
|
|
+ Set<Long> userIds = null;
|
|
|
+ HashMap<Long,JyUser> userMap = new HashMap<>();
|
|
|
if(param.getType() == 2 || param.getType() == 6) { //深时点云,深光点云
|
|
|
page = laserService.pageList(param);
|
|
|
+ userIds = page.getRecords().stream().map(SceneVo::getUserId).collect(Collectors.toSet());
|
|
|
+ userMap = jyUserService.getMapByUserIds(userIds);
|
|
|
}else {
|
|
|
page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
|
|
|
}
|
|
@@ -328,7 +332,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
|
|
|
for (SceneVo record : page.getRecords()) {
|
|
|
record.setStatusString(SceneStatusUtil.getStatusString(record));
|
|
|
-
|
|
|
+ if(userMap.get(record.getUserId()) != null){
|
|
|
+ record.setUserName(userMap.get(record.getUserId()).getRyNo());
|
|
|
+ }
|
|
|
if(map !=null ){
|
|
|
SceneCopyLog sceneCopyLog = map.get(record.getNum());
|
|
|
if(sceneCopyLog != null){
|