From a79f7d80e55319ae1a40954f6a4ce6e382cc1649 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 28 八月 2023 15:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java
index 4f441f8..8bbce31 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/ProceduresExtServiceImpl.java
@@ -230,9 +230,9 @@
return new ArrayList<>();
}
Bom bom = bomList.get(Constants.ZERO);
- List<Procedures> proceduresList = proceduresMapper.selectList(
- new QueryWrapper<Procedures>().apply(" id in ( select r.PROCEDURE_ID from route_procedure r where r.ROUTE_ID = '"+bom.getRouteId()+"' ) ")
- .orderByAsc( " SORTNUM ")
+ List<Procedures> proceduresList = proceduresMapper.selectList(
+ new QueryWrapper<Procedures>().apply(" id in ( select r.PROCEDURE_ID from route_procedure r where r.ROUTE_ID = '"+bom.getRouteId()+"' order by r.SORTNUM ) ")
+
);
return proceduresList;
}
--
Gitblit v1.9.3