From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
index 9c8bcbf..991da86 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
@@ -131,13 +131,6 @@
<if test="param2.areaName != null and param2.areaName != ''">
and dar.area_name like CONCAT('%', #{param2.areaName}, '%')
</if>
- <!-- <if test="param2.deptList != null and param2.deptList.size > 0"> -->
- <!-- and (dar.create_dept in -->
- <!-- <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")"> -->
- <!-- #{deptId} -->
- <!-- </foreach> -->
- <!-- ) -->
- <!-- </if> -->
</where>
order by favorited desc
</select>
@@ -159,6 +152,18 @@
#{item}
</foreach>
</if>
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like CONCAT(#{regionCode}, '%')
+ <!-- 或者设备是共享给当前部门的 -->
+ <if test="currentDeptId != null and currentDeptId != '' ">
+ or dar.device_id in (
+ SELECT device_id FROM ja_fw_device_per_share
+ WHERE loan_to_dept_id = #{currentDeptId}
+ AND is_deleted = 0
+ )
+ </if>
+ )
+ </if>
</where>
</select>
--
Gitblit v1.9.3