From 8cceea916c30592cf02301a36930da37774170cc Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 09 三月 2022 10:40:29 +0800
Subject: [PATCH] 普通用户登录功能

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java
index 04365ab..1c04965 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleGroupController.java
@@ -41,13 +41,14 @@
     }
 
     @GetMapping("/list")
-    public ResponseVO<Object> listGroup(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+    public ResponseVO<Object> listGroup(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
+                                        @RequestParam(value = "groupid", required = false) Long groupid) {
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
-        return ResponseUtil.success(poleGroupService.groupList(baseConditionVO,keyword));
+        return ResponseUtil.success(poleGroupService.groupList(baseConditionVO,keyword,groupid));
     }
 
     @PostMapping("/bind/{groupId}")
-    public ResponseVO<Object> bindPole(@PathVariable Long groupId, PoleGroupRelationParam param) {
+    public ResponseVO<Object> bindPole(@PathVariable Long groupId,@RequestBody PoleGroupRelationParam param) {
         return ResponseUtil.success(poleGroupService.bindPole(groupId,param.getPoleIdList()));
     }
 }

--
Gitblit v1.9.3