diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
index 14cf41876..bfa813dcd 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
@@ -267,7 +267,7 @@
and want_shop_area_id = #{request.wantShopAreaId}
- and line_source #{request.lineSource}
+ and line_source = #{request.lineSource}
and create_time between #{request.createTimeStart} and #{request.createTimeEnd}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java
index 8d5907466..44467dc95 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java
@@ -14,16 +14,16 @@ public class LineListVO extends BaseInfoVO{
@ApiModelProperty("招商经理名称")
private String investmentManagerUserName;
- @ApiModelProperty("招商经理名称")
+ @ApiModelProperty("线索来源名称")
private String lineSourceName;
- @ApiModelProperty("招商经理名称")
+ @ApiModelProperty("创建时间")
private String createTime;
- @ApiModelProperty("招商经理名称")
+ @ApiModelProperty("更新时间")
private String updateTime;
- @ApiModelProperty("招商经理名称")
+ @ApiModelProperty("更新人名称")
private String updateUserName;
public LineListVO(){}
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 c92e67b20..568b9bad1 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
@@ -21,6 +21,7 @@ import com.cool.store.vo.desk.IntendPendingVO;
import com.cool.store.vo.desk.InterviewPendingVO;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -137,6 +138,9 @@ public class DeskServiceImpl implements DeskService {
}
});
List hyPartnerLabelDOS = hyPartnerLabelDAO.listByIds(libelIds);
+ if (CollectionUtils.isEmpty(hyPartnerLabelDOS)){
+ return new HashMap<>();
+ }
return hyPartnerLabelDOS.stream().collect(Collectors.toMap(HyPartnerLabelDO::getId, x -> x));
}