From 92ff484325b9af3afd081ec079f74fbc6dd3fea8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 27 十月 2025 15:43:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml
index 65c5362..fbd2a94 100644
--- a/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml
@@ -136,7 +136,7 @@
<if test="query != null and query.assetTypeId != null">
AND (am.asset_type_id = #{query.assetTypeId} OR FIND_IN_SET(#{query.assetTypeId},at.parent_id))
</if>
- <if test="query != null and query.ownershipDeptId != null">
+ <if test="query != null and query.ownershipDeptId != null and query.ownershipDeptId != 100 and query.ownershipDeptId != 102">
AND am.ownership_dept_id = #{query.ownershipDeptId}
</if>
<if test="query != null and query.assetStatus != null and query.assetStatus != ''">
--
Gitblit v1.7.1