From 67e7b5fc821a35f013e7a46a5957f4c6394d236d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 24 十月 2025 18:14:51 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/resources/mapper/system/AssetInventoryTaskMapper.xml | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/AssetInventoryTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AssetInventoryTaskMapper.xml
index 0c7a40f..13f144e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/AssetInventoryTaskMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AssetInventoryTaskMapper.xml
@@ -153,6 +153,9 @@
<if test="query.resultStatus != null">
AND aiti.result_status = #{query.reslutStatus}
</if>
+ <if test="query.hasNoPermission or query.deptName == '资产管理部'">
+ AND aiti.user_id = #{query.userId}
+ </if>
</where>
ORDER BY
am.asset_code
@@ -170,5 +173,31 @@
WHERE
inventory_task_id = #{taskId}
</select>
+ <select id="getPageList" resultType="com.ruoyi.system.vo.asset.AssetInventoryTaskVO">
+ SELECT ait.id,
+ ait.user_id,
+ ait.dept_id,
+ ait.task_name,
+ ait.execute_date,
+ ait.status,
+ ait.remarks,
+ ait.create_time,
+ ait.create_by,
+ ait.update_time,
+ ait.update_by,
+ ait.disabled,
+ td.dept_name
+ FROM asset_inventory_task ait LEFT JOIN t_dept td ON ait.dept_id = td.id
+ <where>
+ ait.disabled = 0
+ <if test="query.taskName != null and query.taskName != ''">
+ AND ait.task_name LIKE CONCAT('%',#{query.taskName},'%')
+ </if>
+ <if test="query.deptId != null">
+ AND (td.id = #{query.deptId} OR FIND_IN_SET(#{query.deptId}, td.parent_id))
+ </if>
+ </where>
+ ORDER BY ait.create_time DESC
+ </select>
</mapper>
--
Gitblit v1.7.1