From 5ce06c3cf53762f79b0d695f04f509e55e026a17 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: Mon, 21 Aug 2023 16:18:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E6=9D=A5=E6=BA=90=20?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java   | 5 +++--
 .../java/com/cool/store/mapper/HyPartnerLineInfoMapper.java  | 3 ++-
 .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml    | 5 +++++
 .../com/cool/store/request/PrivateSeaLineListRequest.java    | 2 ++
 .../store/service/impl/HyPartnerLineInfoServiceImpl.java     | 5 ++---
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java
index 6bd8b9221..da74d6524 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java
@@ -138,9 +138,10 @@ public class HyPartnerLineInfoDAO {
     }
 
     public List<PrivateSeaLineDTO> getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, String deadlineStart, String deadlineEnd,
-                                                        String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List<String> userIdList,List<String> developmentManagerList,List<Long> userPortraitIdList){
+                                                        String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List<String> userIdList,
+                                                         List<String> developmentManagerList,List<Long> userPortraitIdList,List<Long> userChannelIdList){
         return  hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword,  keywordType,  workflowStage,  workflowStatus,  deadlineStart,  deadlineEnd,
-                intentAreaName,  acceptAdjustType,  storeKeyword,  storeKeywordType, userIdList,developmentManagerList,userPortraitIdList);
+                intentAreaName,  acceptAdjustType,  storeKeyword,  storeKeywordType, userIdList,developmentManagerList,userPortraitIdList,userChannelIdList);
     }
 
 
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java
index 05c447006..65609017d 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java
@@ -176,7 +176,8 @@ public interface HyPartnerLineInfoMapper {
                                                   @Param("storeKeywordType") String storeKeywordType,
                                                   @Param("userIdList") List<String> userIdList,
                                                   @Param("developmentManagerList") List<String> developmentManagerList,
-                                                  @Param("userPortraitIdList") List<Long> userPortraitIdList);
+                                                  @Param("userPortraitIdList") List<Long> userPortraitIdList,
+                                                  @Param("userChannelIdList") List<Long> userChannelIdList);
 
 
     /**
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index 79e888ecb..01d27c613 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -552,6 +552,11 @@
         bi.user_portrait like concat("%,", #{userPortraitId}, ",%")
       </foreach>
     </if>
+    <if test="userChannelIdList!=null and userChannelIdList.size>0">
+      <foreach collection="userChannelIdList" open="and hpuinfo.user_channel_id in (" close=")" separator="," item="userChannelId">
+        #{userChannelId}
+      </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}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java
index 5955d599b..1f37cdffc 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java
@@ -48,5 +48,7 @@ public class PrivateSeaLineListRequest  extends PageInfoRequest {
 
     private List<Long> userPortraitIdList;
 
+    private List<Long> userChannelIdList;
+
 
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
index d62f6ca2c..b7cad70a0 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
@@ -581,9 +581,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         String intentAreaName = getIntentAreaName(request.getIntentArea());
         PageHelper.startPage(request.getPageNum(),request.getPageSize());
         PageInfo privateLineList = new PageInfo(hyPartnerLineInfoDAO.getPrivateSeaLineList(request.getKeyword(),  request.getKeywordType(),  request.getWorkflowStage(),
-                request.getWorkflowStatus(),  request.getDeadlineStart(),  request.getDeadlineEnd(),
-                intentAreaName,  request.getAcceptAdjustType(),  request.getStoreKeyword(),
-                request.getStoreKeywordType(), userIdsByScope.getInvestmentUserIds(),userIdsByScope.getDevelopmentUserIds(),request.getUserPortraitIdList()));
+                request.getWorkflowStatus(),  request.getDeadlineStart(),  request.getDeadlineEnd(), intentAreaName,  request.getAcceptAdjustType(),  request.getStoreKeyword(),
+                request.getStoreKeywordType(), userIdsByScope.getInvestmentUserIds(),userIdsByScope.getDevelopmentUserIds(),request.getUserPortraitIdList(),request.getUserChannelIdList()));
         List<PrivateSeaLineDTO> list = privateLineList.getList();
         if (CollectionUtils.isEmpty(list)){
             return privateLineList;