From 54898304203f3ea0c132899dca4341dc182d13de Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 28 Jan 2026 17:20:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
index 759b7aa..8607c82 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
@@ -31,7 +31,10 @@
 
 
     <select id="selectFwEffectEvalPage" resultMap="fwEffectEvalResultMap">
-        select * from ja_fw_effect_eval
+        select
+            *
+        from
+            ja_fw_effect_eval
         <where>
             is_deleted = 0
             <if test="param2.deviceName != null and param2.deviceName != ''">
@@ -43,6 +46,12 @@
             <if test="param2.counterEffect != null and param2.counterEffect != ''">
                 and counter_effect = #{param2.counterEffect}
             </if>
+            <if test="param2.deptList != null and param2.deptList.size > 0">
+                and create_dept in
+                <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+                    #{deptId}
+                </foreach>
+            </if>
         </where>
     </select>
 

--
Gitblit v1.9.3