From 9dfcab88be185acb1007f96fb0bb47ee23c038ce Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Mon, 20 Jan 2025 16:00:42 +0800
Subject: [PATCH] update

---
 .../modules/database/controller/ExperimentController.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
index 4c9e76b..24939da 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
@@ -88,9 +88,12 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         // 自定义duoXuan字段的查询规则为：LIKE_WITH_OR
         customeRuleMap.put("startDate", QueryRuleEnum.RIGHT_LIKE);
 
-        QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap(), customeRuleMap);
+        Map<String, String[]> parameterMap = req.getParameterMap();
+        QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, parameterMap, customeRuleMap);
         Page<Experiment> page = new Page<>(pageNo, pageSize);
-        page.addOrder(OrderItem.asc("index_no"));
+        if (!parameterMap.containsKey("column") || StringUtils.isBlank(parameterMap.get("column")[0])) {
+            page.addOrder(OrderItem.asc("index_no"));
+        }
         IPage<Experiment> pageList = experimentService.page(page, queryWrapper);
         pageList.getRecords().forEach(v -> experimentService.fetchExperimentDetail(v));
         return Result.OK(pageList);