From d0817418a1c0fc3d637cb3cb2a2fb7f8c1a42d0b Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 23 六月 2022 16:43:39 +0800
Subject: [PATCH] 修改数据库配置
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 17eb980..6d86b3e 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
@@ -64,7 +64,7 @@
Long clientId = SecurityUtils.getClientId();
//鎺掑簭瀛楁
- String orderByResult = OrderByEnums.POLE_GROUP_UPDATE_TIME.getCode();
+ String orderByResult = "group_id";
//姝ｅ簭銆佸�掑彊
String orderBySeq = OrderByEnums.ASC.getCode();
if (order != null) {
@@ -93,7 +93,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