From 62bdf8a25a7491acadc0a2bd083deae999329d1c Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 9 Feb 2023 17:15:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86-=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsReportDetailEOServiceImpl.java     |  2 +-
 .../controller/ParamsInfoEOController.java        | 15 +++++++++++++--
 .../src/views/parameter/parameterlist/index.vue   |  4 ++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index b196352b8..131e98f6c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -126,7 +126,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 		String paramsManifestId = paramsReportDetailVO.getParamsManifestId();
 
 		// 如果排序字段不为空
-		if(StringUtils.isNotEmpty(paramsReportDetailVO.getOrderByField())){`
+		if(StringUtils.isNotEmpty(paramsReportDetailVO.getOrderByField())){
 			StringBuilder sqlSb = new StringBuilder();
 			sqlSb.append(" ORDER BY ").append(paramsReportDetailVO.getOrderByField());
 			if(StringUtils.equals(paramsReportDetailVO.getOrderBy(),"1")){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
index d47626efc..a56a83db2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
@@ -108,8 +108,19 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
 			}
 		}
 		queryWrapper.like(StringUtils.isNotEmpty(paramsInfoEO.getParamsName()), "pi.params_name", paramsInfoEO.getParamsName())
-				.eq(StringUtils.isNotEmpty(paramsInfoEO.getDutyTerritory()), "pi.duty_territory", paramsInfoEO.getDutyTerritory())
-				.orderBy(true, "asc".equals(orderBy)?true:false, "pi.nio_number");
+				.eq(StringUtils.isNotEmpty(paramsInfoEO.getDutyTerritory()), "pi.duty_territory", paramsInfoEO.getDutyTerritory());
+		// 如果排序字段不为空
+		if(StringUtils.isNotEmpty(orderByField)){
+//			if (StringUtils.equals(orderBy,"2")) {
+//				orderBy = " DESC";
+//			}else {
+//				orderBy = " ASC";
+//			}
+			queryWrapper.orderBy(true, "asc".equals(orderBy)?true:false, orderByField);
+		}else {
+			queryWrapper.orderBy(true, "asc".equals(orderBy)?true:false, "pi.nio_number");
+		}
+
 		Page<ParamsInfoEO> page = new Page<ParamsInfoEO>(pageNo, pageSize);
 //		IPage<ParamsInfoEO> pageList = paramsInfoEOService.page(page, queryWrapper);
 		IPage<ParamsInfoEO> pageList = paramsInfoEOService.selectpage(page, queryWrapper);
diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue
index f85de803b..f5e073c7e 100644
--- a/jero-web/src/views/parameter/parameterlist/index.vue
+++ b/jero-web/src/views/parameter/parameterlist/index.vue
@@ -214,6 +214,10 @@ export default {
       let _i = sorter.order === 'descend' ? 'asc': 'desc'
       if(sorter.columnKey == 'dutyTerritory_dictText'){
         sorter.columnKey = 'duty_territory'
+      } else if(sorter.columnKey == 'createTime'){
+        sorter.columnKey = 'create_time'
+      } else if(sorter.columnKey == 'nioNumber'){
+        sorter.columnKey = 'nio_number'
       }
       let _tt = {
         orderByField: sorter.columnKey,