From 6b9325479e26dfc7aa858b32caf3147a0879e886 Mon Sep 17 00:00:00 2001
From: dengchun <mike.deng@vcontractor.co.za>
Date: Thu, 22 May 2025 22:28:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=91=8A=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=9A=84=E8=AF=95=E9=AA=8Cbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/database/controller/ExperimentController.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 df0d104..b2b9787 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
@@ -99,7 +99,7 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
     @GetMapping(value = "/list")
     //    @PermissionData(pageComponent="experiment/manage/ExperimentList")
     public Result<IPage<Experiment>> queryPageList(Experiment experiment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,@RequestParam(name = "pageName", defaultValue = "") String pageName,
                                                    HttpServletRequest req) {
         //Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
         // 自定义duoXuan字段的查询规则为：LIKE_WITH_OR
@@ -114,6 +114,7 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         experiment.setSampleType(StringUtils.remove(experiment.getSampleType(), "*"));
         experiment.setSampleModel(StringUtils.remove(experiment.getSampleModel(), "*"));
         experiment.setEquipmentModel(StringUtils.remove(experiment.getEquipmentModel(), "*"));
+        experiment.setPageName(pageName);
 
         String username = JwtUtil.getUserNameByToken(req);
         SysUser currentUser = userService.getUserByName(username);