From 55a3c6c0170d3dd923a52aa97f12b7b13657b542 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 20 Feb 2024 15:23:54 +0800
Subject: [PATCH] =?UTF-8?q?2024-2-20=20=E5=B7=A5=E8=89=BA=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E7=BA=BF=E4=BD=93=E8=AE=BE=E5=A4=87/=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=AD=E5=BF=83=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/technology/controller/ProProcessController.java  | 6 ++----
 .../main/resources/mapper/technology/ProProcessMapper.xml   | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/op-modules/op-technology/src/main/java/com/op/technology/controller/ProProcessController.java b/op-modules/op-technology/src/main/java/com/op/technology/controller/ProProcessController.java
index c263ecdc5..422d8fbac 100644
--- a/op-modules/op-technology/src/main/java/com/op/technology/controller/ProProcessController.java
+++ b/op-modules/op-technology/src/main/java/com/op/technology/controller/ProProcessController.java
@@ -171,7 +171,6 @@ public class ProProcessController extends BaseController {
      */
     @GetMapping("/getWorkCenterList")
     public TableDataInfo getWorkCenterList(SysFactory sysFactory) {
-        startPage();
         List<SysFactory> list = proProcessService.getWorkCenterList(sysFactory);
         return getDataTable(list);
     }
@@ -181,9 +180,8 @@ public class ProProcessController extends BaseController {
      */
 
     @GetMapping("/getEquipmentTypeList")
-    public TableDataInfo getEquipmentTypeList(Equipment equipment) {
-        startPage();
+    public AjaxResult getEquipmentTypeList(Equipment equipment) {
         List<Equipment> list = proProcessService.getEquipmentTypeList(equipment);
-        return getDataTable(list);
+        return success(list);
     }
 }
diff --git a/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml b/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml
index dc3a4fa46..613ee60b9 100644
--- a/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml
+++ b/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml
@@ -324,6 +324,7 @@
 		from base_equipment
 		where del_flag = '0'
 		group by equipment_type_code,equipment_type_name
+		order by equipment_type_name desc
 	</select>
 
 </mapper>