From 4e76b9737e036c18e8a9e840dc443615ffcec348 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 20 十月 2022 12:20:18 +0800
Subject: [PATCH] 大气农耕
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 93ade56..073ae92 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
@@ -5,7 +5,7 @@
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.param.GroupParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.PoleGroup;
import com.sandu.ximon.dao.domain.PoleGroupRelation;
@@ -14,7 +14,6 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -28,7 +27,7 @@
private final PoleGroupRelationService poleGroupRelationService;
- public boolean addGroup(PoleGroupParam param) {
+ public boolean addGroup(GroupParam param) {
PoleGroup group = new PoleGroup();
if (SecurityUtils.getClientId() != null) {
group.setClientId(SecurityUtils.getUserId());
@@ -37,7 +36,7 @@
return save(group);
}
- public boolean updateGroup(Long groupId, PoleGroupParam param) {
+ public boolean updateGroup(Long groupId, GroupParam param) {
PoleGroup poleGroup = getById(groupId);
if (poleGroup == null) {
throw new BusinessException("鏈壘鍒拌鍒嗙粍");
@@ -93,7 +92,9 @@
//鎺掑簭鏂瑰紡
String orderBy = orderByResult + " " + orderBySeq;
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ }
List<PoleGroup> list;
if (clientId == null) {
--
Gitblit v1.9.3