|
@@ -61,18 +61,15 @@ func (l *GetContactListLogic) GetContactList(req *types.ContactListReq) (*types.
|
|
|
layout := "2006-01-02 15:04:05"
|
|
|
var startTime, endTime *time.Time
|
|
|
|
|
|
- if req.StartDate != nil && *req.StartDate != "" {
|
|
|
- startStr := *req.StartDate + " 00:00:00"
|
|
|
+ if req.SearchDate != nil && len(req.SearchDate) == 2 {
|
|
|
+ startStr := req.SearchDate[0] + " 00:00:00"
|
|
|
if t, err := time.Parse(layout, startStr); err == nil {
|
|
|
//t = t.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
|
|
startTime = &t
|
|
|
} else {
|
|
|
l.Logger.Errorf("invalid startDate: %v", err)
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- if req.EndDate != nil && *req.EndDate != "" {
|
|
|
- endStr := *req.EndDate + " 23:59:59"
|
|
|
+ endStr := req.SearchDate[1] + " 23:59:59"
|
|
|
if t, err := time.Parse(layout, endStr); err == nil {
|
|
|
//t = t.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
|
|
endTime = &t
|