|
@@ -582,7 +582,9 @@ func (this *UserController) List() {
|
|
br.Msg = "日期格式有误"
|
|
br.Msg = "日期格式有误"
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- condition += " AND u.register_time<? "
|
|
|
|
|
|
+ condition += " AND u.register_time<=? "
|
|
|
|
+ // 结束时间包含今天
|
|
|
|
+ registerEndTime = registerEndTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
|
pars = append(pars, registerEndTime)
|
|
pars = append(pars, registerEndTime)
|
|
}
|
|
}
|
|
if createStartDate != "" {
|
|
if createStartDate != "" {
|
|
@@ -600,7 +602,9 @@ func (this *UserController) List() {
|
|
br.Msg = "日期格式有误"
|
|
br.Msg = "日期格式有误"
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- condition += " AND u.create_time<? "
|
|
|
|
|
|
+ condition += " AND u.create_time<=? "
|
|
|
|
+ // 结束时间包含今天
|
|
|
|
+ createEndTime = createEndTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
|
pars = append(pars, createEndTime)
|
|
pars = append(pars, createEndTime)
|
|
}
|
|
}
|
|
if pageSize <= 0 {
|
|
if pageSize <= 0 {
|