1

src/main/java/com/fdkankan/ucenter/service/impl/FusionService.java

@@ -104,6 +104,7 @@ public class FusionService implements IFusionService {
         HashMap<Long, ScenePlusExt> extMap = scenePlusExtService.getByPlusIds(plusIds);
         HashMap<Long, ScenePlusVoid> voidMap = scenePlusVoidService.getByPlusIds(plusIds);
         HashMap<Long, Camera> cameraMap = cameraService.getByIds(cameraIds);
+        HashMap<Long, User> userMap = userService.getByIds(page.getRecords().stream().map(ScenePlus::getUserId).collect(Collectors.toList()));
         for (ScenePlus record : page.getRecords()) {
             ScenePlusVo scenePlusVo = new ScenePlusVo();
             BeanUtils.copyProperties(record,scenePlusVo);
@@ -112,6 +113,7 @@ public class FusionService implements IFusionService {
             scenePlusVo.setSnCode(snCode);
             scenePlusVo.setSceneType(param.getType());
             scenePlusVo.setPlusVoid(voidMap.get(record.getId()));
+            scenePlusVo.setPhone(userMap.get(record.getUserId()) == null ?null : userMap.get(record.getUserId()).getUserName());
             list.add(scenePlusVo);
         }
         Page<ScenePlusVo> pageVo = new Page<>(param.getPageNum(),param.getPageSize());

src/main/java/com/fdkankan/ucenter/service/impl/UserServiceImpl.java

@@ -253,11 +253,13 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
     @Override
     public HashMap<Long, User> getByIds(List<Long> userIds) {
-        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(User::getId,userIds);
-        List<User> list = this.list(wrapper);
         HashMap<Long,User> map = new HashMap<>();
-        list.forEach(entity -> map.put(entity.getId(),entity));
+        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+        if(userIds.size() >0){
+            wrapper.in(User::getId,userIds);
+            List<User> list = this.list(wrapper);
+            list.forEach(entity -> map.put(entity.getId(),entity));
+        }
         return map;
     }
 

src/main/java/com/fdkankan/ucenter/vo/response/ScenePlusVo.java

@@ -10,4 +10,5 @@ public class ScenePlusVo extends ScenePlus {
     private String snCode;
     private ScenePlusExt plusExt;
     private ScenePlusVoid plusVoid;
+    private String phone;
 }