From 0d84ceea78dae51e3d0ef1efdd6cfb6123f522da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Tue, 20 Jun 2023 21:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=81=E6=B5=B7=E7=BA=BF=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/HyPartnerLineInfoMapper.xml        | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index 1c1468707..98350420f 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -497,16 +497,25 @@
     <if test="storeKeywordType!=null and storeKeywordType=='partnerMobile'">
       AND hpuinfo.recommend_partner_mobile like concat('%',#{storeKeyword},'%')
     </if>
-<!--    <if test="userIdList!=null and userIdList.size>0">-->
-<!--      <foreach collection="userIdList" item="userId" open="and hpli.investment_manager in (" close=")" separator=",">-->
-<!--        #{userId}-->
-<!--      </foreach>-->
-<!--    </if>-->
-<!--    <if test="developmentManagerList!=null and developmentManagerList.size>0">-->
-<!--      <foreach collection="developmentManagerList" item="developmentManager" open="and hpli.development_manager in (" close=")" separator=",">-->
-<!--        #{developmentManager}-->
-<!--      </foreach>-->
-<!--    </if>-->
+    <if test="userIdList!=null and userIdList.size>0 and developmentManagerList!=null and developmentManagerList.size==0">
+      <foreach collection="userIdList" item="userId" open="and hpli.investment_manager in (" close=")" separator=",">
+        #{userId}
+      </foreach>
+    </if>
+    <if test="userIdList!=null and userIdList.size==0 and developmentManagerList!=null and developmentManagerList.size>0">
+      <foreach collection="developmentManagerList" item="developmentManager" open="and hpli.development_manager in (" close=")" separator=",">
+        #{developmentManager}
+      </foreach>
+    </if>
+    <if test="userIdList!=null and userIdList.size>0 and developmentManagerList!=null and developmentManagerList.size>0">
+      <foreach collection="userIdList" item="userId" open="and (hpli.investment_manager in (" close=")" separator=",">
+        #{userId}
+      </foreach>
+      <foreach collection="developmentManagerList" item="developmentManager" open="or hpli.development_manager in (" close="))" separator=",">
+        #{developmentManager}
+      </foreach>
+    </if>
+
   </select>