From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml
index 7a9c39d..9f72f1e 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml
@@ -60,12 +60,16 @@
<if test="param2.skilledTaskType != null and param2.skilledTaskType != ''">
and skilled_task_type = #{param2.skilledTaskType}
</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 test="param2.areaCode != null and param2.areaCode != ''">
+ and area_code like concat('%',#{param2.areaCode},'%')
</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