From 54cd0ca82059cdad4e9ee5b9b1c7164d443ab46f Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 11 二月 2022 11:26:52 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java
index edcea02..f230f0a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java
@@ -1,7 +1,9 @@
package com.sandu.ximon.admin.service;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.PoleGroupParam;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -25,7 +27,10 @@
public boolean addGroup(PoleGroupParam param) {
PoleGroup group = new PoleGroup();
- group.setClientId(SecurityUtils.getClientId());
+ if(SecurityUtils.getClientId()!=null){
+ group.setClientId(SecurityUtils.getUserId());
+ }
+
group.setGroupName(param.getGroupName());
return save(group);
}
@@ -49,12 +54,13 @@
return removeById(groupId);
}
- public List<PoleGroup> groupList() {
+ public List<PoleGroup> groupList(BaseConditionVO baseConditionVO,String keyword) {
Long clientId = SecurityUtils.getClientId();
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
if (clientId == null) {
- return list();
+ return list(Wrappers.lambdaQuery(PoleGroup.class).like(PoleGroup::getGroupName,keyword));
} else {
- return list(Wrappers.lambdaQuery(PoleGroup.class).eq(PoleGroup::getClientId, clientId));
+ return list(Wrappers.lambdaQuery(PoleGroup.class).eq(PoleGroup::getClientId, clientId).like(PoleGroup::getGroupName,keyword));
}
}
--
Gitblit v1.9.3