df

src/main/java/com/fdkankan/manage/common/PageInfo.java

@@ -1,11 +1,13 @@
 package com.fdkankan.manage.common;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.manage.vo.response.SceneVo;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -40,4 +42,10 @@ public class PageInfo<T> {
     }
 
 
+    public static PageInfo PageInfoEmpty(Integer pageNum,Integer pageSize) {
+        Page<Object> voPage = new Page<>(pageNum,pageSize);
+        voPage.setRecords(new ArrayList<>());
+        voPage.setTotal(0);
+        return PageInfo.PageInfo(voPage);
+    }
 }

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

@@ -47,13 +47,13 @@ public class LaserService {
 
     public PageInfo pageList(SceneParam param) {
         LaserSceneParam laserSceneParam = getLaserSceneParam(param);
+        if(laserSceneParam == null){
+            return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
+        }
         FdkkResponse response = laserClient.sceneList(laserSceneParam);
         JSONObject jsonObject =response.getData();
         if(jsonObject == null){
-            Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
-            voPage.setRecords(new ArrayList<>());
-            voPage.setTotal(0);
-            return PageInfo.PageInfo(voPage);
+            return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
         }
         JSONArray list = jsonObject.getJSONArray("list");
         long total =jsonObject.getLong("total");
@@ -89,9 +89,13 @@ public class LaserService {
     }
 
     private LaserSceneParam getLaserSceneParam(SceneParam param) {
+        LaserSceneParam newParam = new LaserSceneParam();
         if(param.getCompanyId()!= null){ //客户场景
             List<CameraDetail> cameraDetails = cameraDetailService.getListByCompanyId(param.getCompanyId());
             param.setSnCodes(this.setSnCodes(cameraDetails));
+            if(param.getSnCodes() == null || param.getSnCodes().size() <=0){
+                return null;
+            }
         }
         if(StringUtils.isNotBlank(param.getUserName())){
             List<CameraDetail> cameraDetails = cameraDetailService.getByUserName(param.getUserName());
@@ -101,7 +105,7 @@ public class LaserService {
                 (param.getSnCodes() == null || param.getSnCodes().size() <=0)){
             param.setSnCode("phoneEmptySelect");
         }
-        LaserSceneParam newParam = new LaserSceneParam();
+
         BeanUtils.copyProperties(param,newParam);
         newParam.setTitle(param.getSceneName());
         return newParam;