From 853c8ba11072eae475273864e61733ae7294f004 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 25 九月 2025 11:55:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml
index 869bc5e..887b27b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml
@@ -20,5 +20,40 @@
<sql id="Base_Column_List">
id, type_name, type_code, parent_id, level, create_time, create_by, update_time, update_by, disabled
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.vo.AssetStatisticsVO">
+ select t1.id as assetTypeIdSecond,t1.type_name as assetTypeNameSecond,
+ t2.id as assetTypeIdFirst,t2.type_name as assetTypeNameFirst
+ FROM asset_type t1
+ left join asset_type t2 on t1.parent_id = t2.id
+ where 1=1
+ and
+ t1.parent_id != 0
+ <if test="query.assetTypeIds != null and query.assetTypeIds.size()>0">
+ AND t1.id IN
+ <foreach collection="query.assetTypeIds" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ AND t2.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+
+ </select>
+ <select id="pageListNoLimit" resultType="com.ruoyi.system.vo.AssetStatisticsVO">
+ select t1.id as assetTypeIdSecond,t1.type_name as assetTypeNameSecond,
+ t2.id as assetTypeIdFirst,t2.type_name as assetTypeNameFirst
+ FROM asset_type t1
+ left join asset_type t2 on t1.parent_id = t2.id
+ where 1=1
+ and
+ t1.parent_id != 0
+ <if test="query.assetTypeIds != null and query.assetTypeIds.size()>0">
+ AND t1.id IN
+ <foreach collection="query.assetTypeIds" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ AND t2.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </select>
</mapper>
--
Gitblit v1.7.1