From 4319627cf67d19093a18ff724c21782e34fc7a26 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 10 Oct 2023 15:44:27 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-api/src/main/resources/mapper/AllocationMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/AllocationMapper.xml b/screen-api/src/main/resources/mapper/AllocationMapper.xml
index 446ee62..7562062 100644
--- a/screen-api/src/main/resources/mapper/AllocationMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationMapper.xml
@@ -90,6 +90,9 @@
             <if test="allocation.endTime != null and allocation.endTime !='' ">
                 and date(allocation.escalation_time) <![CDATA[<=]]>  #{allocation.endTime}
             </if>
+            <if test="allocation.allocationNum != null and allocation.allocationNum !='' ">
+                and allocation.allocation_num LIKE CONCAT('%',#{allocation.allocationNum},'%')
+            </if>
             <if test="allocation.unitList != null and allocation.unitList.size !=0">
                 and allocation.unit_id in
                 <foreach collection="allocation.unitList" item="id" index="index" open="(" close=")" separator=",">

--
Gitblit v1.8.0