分享场景列表

src/main/java/com/fdkankan/manage/service/impl/JyUserShareServiceImpl.java

@@ -115,26 +115,30 @@ public class JyUserShareServiceImpl extends ServiceImpl<IJyUserShareMapper, JyUs
         if(param.getJyUserId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        HashMap<String,SceneVo> map = new HashMap<>();
+
         Page<UserShareSceneVo> page = scenePlusService.shareScenePageList(new Page<>(param.getPageNum(), param.getPageSize()),param);
         List<String> ssNumList = page.getRecords().stream().filter(e -> e.getSceneSource().equals(4)).map(UserShareSceneVo::getNum).collect(Collectors.toList());
         List<String> sgNumList = page.getRecords().stream().filter(e -> e.getSceneSource().equals(5)).map(UserShareSceneVo::getNum).collect(Collectors.toList());
         SceneParam laserParam = new SceneParam();
         laserParam.setPageNum(1);
         laserParam.setPageSize(999);
-        laserParam.setAuthNumList(ssNumList);
-        laserParam.setType(2);
-        Page<SceneVo> sceneVoPage = laserService.pageList(laserParam);
-        laserParam.setType(6);
-        laserParam.setAuthNumList(sgNumList);
-        Page<SceneVo> sceneVoPage2 = laserService.pageList(laserParam);
-        HashMap<String,SceneVo> map = new HashMap<>();
-        for (SceneVo sceneVo : sceneVoPage.getRecords()) {
-            map.put(sceneVo.getNum(),sceneVo);
+        if(!ssNumList.isEmpty()){
+            laserParam.setType(2);
+            laserParam.setAuthNumList(ssNumList);
+            Page<SceneVo> sceneVoPage = laserService.pageList(laserParam);
+            for (SceneVo sceneVo : sceneVoPage.getRecords()) {
+                map.put(sceneVo.getNum(),sceneVo);
+            }
         }
-        for (SceneVo sceneVo : sceneVoPage2.getRecords()) {
-            map.put(sceneVo.getNum(),sceneVo);
+        if(!sgNumList.isEmpty()){
+            laserParam.setType(6);
+            laserParam.setAuthNumList(sgNumList);
+            Page<SceneVo> sceneVoPage2 = laserService.pageList(laserParam);
+            for (SceneVo sceneVo : sceneVoPage2.getRecords()) {
+                map.put(sceneVo.getNum(),sceneVo);
+            }
         }
-
         for (UserShareSceneVo record : page.getRecords()) {
             //替换深时标题，链接
             SceneVo sceneVo = map.get(record.getNum());