From 9490c47566a0f253f35a1019fd1b1e1473630d67 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 20 一月 2025 09:48:53 +0800 Subject: [PATCH] Merge branch 'dev' --- ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml index ee9d42b..d2bf388 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml @@ -98,7 +98,11 @@ </insert> <select id="getErrorList" resultType="com.ycl.system.entity.SysDictData"> - SELECT da.dict_value, da.dict_label FROM t_work_order_error_type oer INNER JOIN sys_dict_data da ON oer.error_name = da.dict_value WHERE oer.work_order_no = #{workOrderNo} + SELECT da.dict_value, da.dict_label + FROM t_work_order_error_type oer + INNER JOIN sys_dict_data da ON oer.error_name = da.dict_value + WHERE oer.work_order_no = #{workOrderNo} + ORDER BY oer.create_time </select> </mapper> -- Gitblit v1.8.0