From f728dc7cdc17a6fa78c19b9cc0427dda7fb35ab4 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 22 Dec 2022 15:12:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=92=8C=E8=AE=A2=E9=98=85-?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OnlCgformCollectionServiceImpl.java        |  7 ++++++-
 .../service/impl/OnlCgformSubscribeServiceImpl.java | 13 +++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java
index 7741d6b9a..d475d8a21 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java
@@ -230,16 +230,21 @@ public class OnlCgformCollectionServiceImpl extends ServiceImpl<OnlCgformCollect
 	public IPage<OnlCgformCollection> queryPageList(Map<String, Object> params) {
 //		params.put("orderByField","serial_number");
 //		params.put("orderBy","1");
+		if(ObjectUtils.isEmpty(params.get("orderByField"))){
+			params.put("orderBy","");
+		}
 		Integer pageNo = Integer.parseInt(params.get("pageNo").toString());
 		Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
 		IPage page = new Page(pageNo, pageSize);
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		params.put("createBy",sysUser.getUsername());
-		IPage result = onlCgformCollectionMapper.queryPageList(page,params);
+		IPage result = new Page();
 		//表头排序（状态单独处理）
 		if(ObjectUtils.isNotEmpty(params.get("orderByField")) && "state".equals((String) params.get("orderByField"))){
 			List<Map<String, Object>> infoList = onlCgformCollectionMapper.infoList(params);
 			result = stateSort(params,pageNo,pageSize,result,infoList);
+		}else{
+			result = onlCgformCollectionMapper.queryPageList(page,params);
 		}
 		List<Map<String,Object>> records = result.getRecords();
 		dataDispose(records,params);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java
index 34d732bfd..a24fa9ae1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java
@@ -25,7 +25,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -209,16 +213,21 @@ public class OnlCgformSubscribeServiceImpl extends ServiceImpl<OnlCgformSubscrib
 	public IPage<OnlCgformSubscribe> queryPageList(Map<String,Object> params) {
 //		params.put("orderByField","title");
 //		params.put("orderBy","1");
+		if(ObjectUtils.isEmpty(params.get("orderByField"))){
+			params.put("orderBy",null);
+		}
 		Integer pageNo = Integer.parseInt(params.get("pageNo").toString());
 		Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
 		IPage page = new Page(pageNo, pageSize);
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		params.put("createBy",sysUser.getUsername());
-		IPage result = onlCgformSubscribeMapper.queryPageList(page,params);
+		IPage result = new Page();
 		//表头排序（状态单独处理）
 		if(ObjectUtils.isNotEmpty(params.get("orderByField")) && "state".equals((String) params.get("orderByField"))){
 			List<Map<String, Object>> mapList = onlCgformSubscribeMapper.infoList(params);
 			result = onlCgformCollectionService.stateSort(params,pageNo,pageSize,result,mapList);
+		}else{
+			result = onlCgformSubscribeMapper.queryPageList(page,params);
 		}
 		List<Map<String,Object>> records = result.getRecords();
 		dataDispose(records,params);