1

src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -67,7 +67,14 @@ public class LaserService {
         if(StringUtils.isNotBlank(param.getUserName())){
             List<User> likeUserName = userService.getLikeUserName(param.getUserName());
             List<Long> userIds = likeUserName.stream().map(User::getId).collect(Collectors.toList());
-            laserSceneParam.setOtherUserIds(userIds);
+            if(!param.getUserIds().isEmpty() && !userIds.isEmpty()){
+                List<Long> list=  param.getUserIds().stream().filter(userIds::contains).collect(Collectors.toList());
+                laserSceneParam.setOtherUserIds(list);
+            }
+            if(userIds.isEmpty()){
+                return getResultPage(0L,new ArrayList<>());
+
+            }
         }
 
         if(param.getType() == 2){
@@ -83,7 +90,7 @@ public class LaserService {
         FdkkResponse response = laserClient.sceneList(laserSceneParam);
         JSONObject jsonObject =response.getData();
         if(jsonObject == null){
-            return null;
+            return getResultPage(0L,new ArrayList<>());
         }
         JSONArray list = jsonObject.getJSONArray("list");
         long total =jsonObject.getLong("total");
@@ -106,9 +113,13 @@ public class LaserService {
             vo.setPayStatus(1);
             sceneVoList.add(vo);
         }
+        return getResultPage(total,sceneVoList);
+    }
+
+    private Page<SceneVo> getResultPage(Long total,List<SceneVo> list){
         Page<SceneVo> page = new Page<>();
-        page.setTotal(total);
-        page.setRecords(sceneVoList);
+        page.setTotal(0);
+        page.setRecords(list);
         return page;
     }