From cb37c30513bcd92f7d3f3d21b9c509f9d3355da5 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 22 Jun 2022 09:56:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql        | 6 +++++-
 .../cert/template/controller/ParamsInfoEOController.java    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql b/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql
index 3f2798162..21d3cc26d 100644
--- a/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql
+++ b/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql
@@ -49,4 +49,8 @@ ALTER TABLE `laws_weilai`.`params_report_detail`
 
 ---2022-06-15
 ALTER TABLE `laws_weilai`.`sys_user_role`
-    MODIFY COLUMN `role_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色id' AFTER `user_id`;
\ No newline at end of file
+    MODIFY COLUMN `role_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色id' AFTER `user_id`;
+
+---2022-06-21
+ALTER TABLE `laws_weilai`.`params_report_config`
+    ADD COLUMN `old_params_config_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收集库参数配置id' AFTER `display_seq`;
\ No newline at end of file
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
index b1fe83c38..9dad10dce 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
@@ -80,7 +80,7 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
 				.like(StringUtils.isNotEmpty(paramsInfoEO.getNioNumber()), ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber())
 				.like(StringUtils.isNotEmpty(paramsInfoEO.getParamsName()), ParamsInfoEO::getParamsName, paramsInfoEO.getParamsName())
 				.eq(StringUtils.isNotEmpty(paramsInfoEO.getDutyTerritory()), ParamsInfoEO::getDutyTerritory, paramsInfoEO.getDutyTerritory())
-				.orderBy(StringUtils.isNotBlank(orderByField), "1".equals(orderBy)?true:false, ParamsInfoEO::getNioNumber)
+				.orderBy(StringUtils.isNotBlank(orderByField), "asc".equals(orderBy)?true:false, ParamsInfoEO::getNioNumber)
 				.orderByDesc(ParamsInfoEO::getCreateTime);
 		Page<ParamsInfoEO> page = new Page<ParamsInfoEO>(pageNo, pageSize);
 		IPage<ParamsInfoEO> pageList = paramsInfoEOService.page(page, queryWrapper);