Merge branch 'CRM13.7' into debug

controllers/yb/apply_record.go

@@ -322,11 +322,11 @@ func (this *ApplyRecordController) UserApplyList() {
 	}
 	if startDate != "" {
 		startDate += " 00:00:00"
-		condition += ` AND a.report_last_view_time >= '` + startDate + `' `
+		condition += ` AND IF(y.apply_record_id > 0,y.create_time, a.created_time) >= '` + startDate + `' `
 	}
 	if endDate != "" {
 		endDate += " 23:59:59"
-		condition += ` AND a.report_last_view_time <= '` + endDate + `' `
+		condition += ` AND IF(y.apply_record_id > 0,y.create_time, a.created_time) <= '` + endDate + `' `
 	}
 
 	reqApplyStatus := this.GetString("ApplyStatus")