From 609d2309c53744ef0553d3bc2202303708f5f341 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, 15 Apr 2024 09:36:20 +0800
Subject: [PATCH] bug

---
 .../src/main/resources/mapper/LineInfoMapper.xml              | 4 ++--
 .../java/com/cool/store/service/impl/DeskServiceImpl.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
index e8ff722d0..806624594 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
@@ -416,10 +416,10 @@
       and b.area_path like concat('%',#{wantShopAreaName},'%')
     </if>
     <if test="request.queryUserId!=null and request.queryUserId!=''">
-      <if test="request.queryType != null and request.queryType == '1' ">
+      <if test="request.queryType != null and request.queryType == 1 ">
         and a.investment_manager = #{request.queryUserId}
       </if>
-      <if test="request.queryType != null and request.queryType == '2' ">
+      <if test="request.queryType != null and request.queryType == 2 ">
         and a.development_manager = #{request.queryUserId}
       </if>
     </if>
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
index 68f6bbef8..c59f00ace 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
@@ -194,7 +194,7 @@ public class DeskServiceImpl implements DeskService {
         Map<Long, String>  wantShopAreaMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaIds);
         List<Long> lineIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getId() != null).map(LineInfoDO::getId).collect(Collectors.toList());
         List<SigningBaseInfoDO> signingBaseInfoDOS = intentAgreementMapper.selectByLineIds(lineIds);
-        Map<Long, Date> dateMap = signingBaseInfoDOS.stream().collect(Collectors.toMap(SigningBaseInfoDO::getId, SigningBaseInfoDO::getCreateTime));
+        Map<Long, Date> dateMap = signingBaseInfoDOS.stream().collect(Collectors.toMap(SigningBaseInfoDO::getLineId, SigningBaseInfoDO::getCreateTime));
         List<SigningPendingVO> list = new ArrayList<>();
         lineInfoDOS.forEach(x->{
             BaseInfoVO baseInfoVO = convertToBaseInfoVO(x, userPortraitMap, wantShopAreaMap);