From 1337f249608bcbd7ad6cf244870e560a95821727 Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期二, 12 十一月 2024 11:30:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml index 3a7e1a6..84df17f 100644 --- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml +++ b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml @@ -68,6 +68,7 @@ LEFT JOIN t_mpk_method_setting c ON b.id = c.method_id LEFT JOIN t_mpk_setting_select d ON c.id = d.setting_id WHERE a.id = #{id} + ORDER BY b.sort,c.sort,d.sort </select> <select id="selectByIds" resultMap="mpkFile"> SELECT @@ -99,7 +100,7 @@ <foreach collection="ids" item="item" open="(" close=")" separator=","> #{item} </foreach> - ORDER BY e.sort,f.sort,a.create_date + ORDER BY b.sort,c.sort,d.sort,e.sort,f.sort,a.create_date </select> <select id="getProjectModelCount" resultType="java.lang.Integer" parameterType="java.lang.String"> SELECT -- Gitblit v1.9.3