From ef270bd1855b5ce3f398c5df024840a498e33a8f Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 31 三月 2022 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
index faea1fa..4ee399b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -205,4 +205,23 @@
     }
 
 
+    /**
+     * 鏌ユ壘鑷繁鎷ユ湁鐨勭伅鏉�
+     */
+    @PostMapping("/getOwnerPole/{cilentId}")
+    public ResponseVO<Object> getOwnerPole(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword
+            ,@PathVariable Long cilentId) {
+        List<Pole> results = poleService.getOwnerPole(baseConditionVO, keyword, cilentId);
+//        CommonPage commonPage = CommonPage.restPage(results);
+//        int size = results.size();
+//        commonPage.setTotal((long) size);
+//        commonPage.setTotalPage(size / baseConditionVO.getPageSize() + 1);
+//        if (size % baseConditionVO.getPageSize() == 0) {
+//            commonPage.setTotalPage(size / baseConditionVO.getPageSize());
+//        }
+//        return ResponseUtil.success(commonPage);
+        return ResponseUtil.success(results);
+    }
+
+
 }

--
Gitblit v1.9.3