From 0f44078d297adcbaee7c9a16b4f4d3257d858491 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 07 三月 2025 17:35:14 +0800
Subject: [PATCH] 代码迁移bug解决
---
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index e97a9cd..7eafed8 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -329,6 +329,7 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
+ ORDER BY declare_date DESC
</select>
<select id="selectIfsInventoryQuantity" resultType="com.ruoyi.basic.dto.IfsInventoryQuantityCheckDto">
SELECT * from ifs_inventory_quantity ifs
@@ -378,10 +379,12 @@
select model label,
model value
from standard_tree
- where sample_type in
- <foreach item="item" collection="sampleTypeValues" open="(" separator="," close=")">
- #{item}
- </foreach>
- and sample is null
+ where sample is null
+ <if test="sampleTypeValues != null and sampleTypeValues.size() > 0">
+ and sample_type in
+ <foreach item="item" collection="sampleTypeValues" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3