From 6fa15cd53f9331b088a07e5965798ba5856f3b0c Mon Sep 17 00:00:00 2001 From: dengchun Date: Sun, 6 Jul 2025 17:10:11 +0800 Subject: [PATCH] =?UTF-8?q?bug=20fix:=201.=20=E7=9F=A5=E8=AF=86=E5=BA=93?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=E7=9B=AE=E5=BD=95=E6=8E=92=E5=BA=8F=EF=BC=9B?= =?UTF-8?q?=202.=202=E4=B8=AA=E7=BB=9F=E8=AE=A1=E6=95=B0=E9=87=8F=E4=B8=8D?= =?UTF-8?q?=E8=BF=94=E5=9B=9Emessage;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/database/constant/StageDataType.java | 2 +- .../database/controller/DocumentLibraryController.java | 2 +- .../modules/database/controller/ExperimentController.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/StageDataType.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/StageDataType.java index 3fb9c07..661b829 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/StageDataType.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/StageDataType.java @@ -9,7 +9,7 @@ public enum StageDataType { RADIATION_PROCESS(1, "辐照过程"), TEST_PROCESS(2, "测试过程"), - ANNEAL_PROCESS(3, "测试过程"), + ANNEAL_PROCESS(3, "退火过程"), ; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java index d06d78a..8bbad7d 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java @@ -91,7 +91,7 @@ public class DocumentLibraryController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(documentLibrary, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(documentLibrary, req.getParameterMap()).orderByAsc("tags"); Page page = new Page(pageNo, pageSize); IPage pageList = documentLibraryService.page(page, queryWrapper); return Result.OK(pageList); 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 4187c94..e59093d 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 @@ -282,7 +282,9 @@ public class ExperimentController extends JeecgController