|
@@ -47,10 +47,14 @@ public class BusinessOpportunitiesServiceImpl implements BusinessOpportunitiesSe
|
|
|
@Override
|
|
|
public PageInfo<List<FollowUpRecordBo>> searchFollowList(WorkTableSearchVo workVo, String userId) {
|
|
|
PageHelper.startPage(workVo.getPageNum(),workVo.getPageSize(),true);
|
|
|
- if (workVo.getStartTime().equals(""))
|
|
|
- workVo.setStartTime(null);
|
|
|
- if (workVo.getEndTime().equals(""))
|
|
|
- workVo.setEndTime(null);
|
|
|
+ if (workVo.getStartTime() != null){
|
|
|
+ if (workVo.getStartTime().equals(""))
|
|
|
+ workVo.setStartTime(null);
|
|
|
+ }
|
|
|
+ if (workVo.getEndTime() != null){
|
|
|
+ if (workVo.getEndTime().equals(""))
|
|
|
+ workVo.setEndTime(null);
|
|
|
+ }
|
|
|
List<FollowUpRecord> records = followUpDao.searchAllByMulti(workVo.getClueId(), workVo.getText(), workVo.getStartTime(), workVo.getEndTime(), userId);
|
|
|
List<FollowUpRecordBo> recordBos = new ArrayList<>();
|
|
|
for (FollowUpRecord record : records){
|