From f769d817f8ba2522147c73fa93ccacdc3aab0cb6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 24 十月 2025 18:15:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml
index 6a10a9d..addde14 100644
--- a/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml
@@ -97,6 +97,10 @@
#{item}
</foreach>
</if>
+ <if test="query.assetStatus != null and query.assetStatus!=''">
+ and t1.asset_status like concat('%',#{query.assetStatus},'%')
+ </if>
+ and t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
order by t1.create_time desc
@@ -167,13 +171,16 @@
left join t_dept t4 on t4.id = t1.ownership_dept_id
where 1=1
AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ and t1.asset_status = '闲置'
<if test="query.assetMainIds != null and query.assetMainIds.size()>0">
AND t1.id IN
<foreach collection="query.assetMainIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
-
+ <if test="query.assetStatus != null and query.assetStatus!=''">
+ and t1.asset_status like concat('%',#{query.assetStatus},'%')
+ </if>
order by t1.create_time desc
</select>
@@ -196,7 +203,10 @@
#{item}
</foreach>
</if>
-
+ <if test="query.assetStatus != null and query.assetStatus!=''">
+ and t1.asset_status like concat('%',#{query.assetStatus},'%')
+ </if>
+ and t1.asset_status = '闲置'
order by t1.create_time desc
</select>
--
Gitblit v1.7.1