From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev

---
 screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml b/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
index d20106c..4af3088 100644
--- a/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml
@@ -43,8 +43,11 @@
         <where>
             1 = 1 and allocationextension.is_del = 0
 
-            <if test="allocation.unitId != null and allocation.unitId != 0">
-                and t1.unit_id = #{allocation.unitId}
+            <if test="allocation.unitId != null and allocation.unitId.size != 0">
+                and t1.unit_id in
+                <foreach collection="allocation.unitId" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
             </if>
             <if test="allocation.polluteType != null and allocation.polluteType != 0">
                 and t1.pollute_type = #{allocation.polluteType}

--
Gitblit v1.8.0