Merge branch 'master' of https://git.trj.tw/golang/mtfosbot

2018-12-06 10:20:07 +08:00
parent 9bbd17a39b 2626234eeb
commit 1584aacb04
2 changed files with 14 additions and 3 deletions
@@ -49,6 +49,10 @@ func GetLineMessageLog(c *context.Context) {

 	g := c.DefaultQuery("group", "")
 	u := c.DefaultQuery("user", "")
+	order := c.DefaultQuery("order", "desc")
+	if order != "asc" && order != "desc" {
+		order = "desc"
+	}

 	where := make(map[string]string)
 	if len(g) > 0 {
@@ -66,8 +70,12 @@ func GetLineMessageLog(c *context.Context) {
 	}

 	page := utils.CalcPage(count, numP, numMax)
+	if numP == -1 {
+		numP = page.Total
+	}
+	page = utils.CalcPage(count, numP, numMax)

-	logs, err := model.GetLineMessageLogList(g, u, page.Offset, page.Limit)
+	logs, err := model.GetLineMessageLogList(g, u, page.Offset, page.Limit, order)
 	if err != nil {
 		c.ServerError(nil)
 		return