LIVE_YE 1 年之前
父节点
当前提交
f61e8324cb

+ 5 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/BomanCameraController.java

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -40,7 +42,9 @@ public class BomanCameraController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(BomanCamera bomanCamera)
     {
-        startPage();
+        if(StringUtils.isEmpty(bomanCamera.getIsPage()) || StringUtils.equals("Y",bomanCamera.getIsPage())){
+            startPage();
+        }
         List<BomanCamera> list = bomanCameraService.selectBomanCameraList(bomanCamera);
         return getDataTable(list);
     }

+ 12 - 1
ruoyi-system/src/main/java/com/ruoyi/system/domain/BomanCamera.java

@@ -52,7 +52,18 @@ public class BomanCamera extends BaseEntity
     @Excel(name = "排序")
     private Long sort;
 
-    public void setCameraId(Long cameraId) 
+    /** 是否分页 */
+    private String isPage;
+
+    public String getIsPage() {
+        return isPage;
+    }
+
+    public void setIsPage(String isPage) {
+        this.isPage = isPage;
+    }
+
+    public void setCameraId(Long cameraId)
     {
         this.cameraId = cameraId;
     }