修改分页bug，分页返回字段pageNum,pageSize改成page、rows

controllers/partial/SystemController.go

@@ -1,17 +1,14 @@
-
 package partial
 
 import (
+	"fmt"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 	sysmodel "git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 	sysutils "git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
-	"fmt"
+	"strconv"
 )
 
-
-
-
 // _Sidebar
 // @Title _Sidebar
 // @Description 获取导航菜单
@@ -20,15 +17,14 @@ import (
 // @Failure 403 :id is empty
 func System_Sidebar(c *entitys.CtrlContext) {
 
-
 	fmt.Println(c.Db.DataSourceName())
 
 	paramMap_i_t := map[string]interface{}{"sort": "name"}
-	result, err := sysutils.TreeSearch(c.Db, "system","sidebar", "sys_menu", paramMap_i_t)
+	result, err := sysutils.TreeSearch(c.Db, "system", "sidebar", "sys_menu", paramMap_i_t)
 
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 
@@ -46,7 +42,7 @@ func System_GetMenuTree(c *entitys.CtrlContext) {
 	ret := __none_func_system__(user)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
@@ -57,15 +53,16 @@ func System_GetMenuTree(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_FindUserPage(c *entitys.CtrlContext) {
+	page, _ := strconv.Atoi(c.Ctx.DefaultQuery("page", "1"))
+	rows, _ := strconv.Atoi(c.Ctx.DefaultQuery("rows", "10"))
+	name := c.Ctx.DefaultQuery("name", "")
+	login_id := c.Ctx.DefaultQuery("login_id", "")
 
-	var page int64  = c.Ctx.GetInt64("page")
-	var rows int64 = c.Ctx.GetInt64("rows")
-
-	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows}
-	result, err := sysutils.PageSearch(c.Db,"system","find_user_page", "sys_user", paramMap_i_t)
+	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows, "name": name, "login_id": login_id}
+	result, err := sysutils.PageSearch(c.Db, "system", "find_user_page", "sys_user", paramMap_i_t)
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 
@@ -78,13 +75,12 @@ func System_FindUserPage(c *entitys.CtrlContext) {
 // @Failure 403 :id is empty
 func System_GetOrgTree(c *entitys.CtrlContext) {
 
-
 	paramMap_i_t := map[string]interface{}{"sort": "name"}
-	result, err := sysutils.TreeSearch(c.Db, "system","get_org_tree", "sys_org", paramMap_i_t)
+	result, err := sysutils.TreeSearch(c.Db, "system", "get_org_tree", "sys_org", paramMap_i_t)
 
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 
@@ -105,10 +101,10 @@ func System_AddUser(c *entitys.CtrlContext) {
 	org_id := c.Ctx.Query("org_id")
 	email := c.Ctx.Query("email")
 
-	ret := __none_func_system__(login_id,password,org_id,email)
+	ret := __none_func_system__(login_id, password, org_id, email)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
@@ -125,7 +121,7 @@ func System_DelUser(c *entitys.CtrlContext) {
 	ret := __none_func_system__(id)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
@@ -145,10 +141,10 @@ func System_UpdateUser(c *entitys.CtrlContext) {
 	org_id := c.Ctx.Query("org_id")
 	email := c.Ctx.Query("email")
 
-	ret := __none_func_system__(login_id,password,org_id,email)
+	ret := __none_func_system__(login_id, password, org_id, email)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
@@ -164,10 +160,10 @@ func System_AddRole(c *entitys.CtrlContext) {
 	name := c.Ctx.Query("name")
 	remark := c.Ctx.Query("remark")
 
-	ret := __none_func_system__(name,remark)
+	ret := __none_func_system__(name, remark)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
@@ -184,7 +180,7 @@ func System_DelRole(c *entitys.CtrlContext) {
 	ret := __none_func_system__(id)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
@@ -202,10 +198,10 @@ func System_UpdateRole(c *entitys.CtrlContext) {
 	name := c.Ctx.Query("name")
 	remark := c.Ctx.Query("remark")
 
-	ret := __none_func_system__(id,name,remark)
+	ret := __none_func_system__(id, name, remark)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
@@ -222,7 +218,7 @@ func System_FindRolePage(c *entitys.CtrlContext) {
 	ret := __none_func_system__(paramObj0)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
@@ -239,7 +235,7 @@ func System_FindRoleMenu(c *entitys.CtrlContext) {
 	ret := __none_func_system__(role_id)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
@@ -256,7 +252,7 @@ func System_SaveRoleMenu(c *entitys.CtrlContext) {
 	ret := __none_func_system__(paramObj0)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
@@ -271,7 +267,7 @@ func System_RoleAll(c *entitys.CtrlContext) {
 	ret := __none_func_system__()
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
@@ -286,7 +282,7 @@ func System_FindPermissions(c *entitys.CtrlContext) {
 	ret := __none_func_system__()
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
@@ -303,7 +299,7 @@ func System_AddMenu(c *entitys.CtrlContext) {
 	ret := __none_func_system__(paramObj0)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
@@ -320,7 +316,7 @@ func System_DelMenu(c *entitys.CtrlContext) {
 	ret := __none_func_system__(id)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
@@ -337,12 +333,11 @@ func System_UpdateMenu(c *entitys.CtrlContext) {
 	ret := __none_func_system__(paramObj0)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
-
-func __none_func_system__(params ... interface{}) bool{
+func __none_func_system__(params ...interface{}) bool {
 	return true
 }

light-apiengine.xml

@@ -239,8 +239,8 @@
             <prop name="error" caption="error" type="string" />
         </bean>
         <bean name="page_result" desc="分页结果">
-            <prop name="pageNum" caption="页码" type="int" />
-            <prop name="pageSize" caption="单页数" type="int" />
+            <prop name="page" caption="页码" type="int" />
+            <prop name="rows" caption="单页数" type="int" />
             <prop name="totalSize" caption="总页数" type="int64" />
             <prop name="content" caption="内容" type="interface{}" />
         </bean>
@@ -443,4 +443,4 @@
             <column isNull="false" name="del_flag" caption="是否删除 0：删除   1：正常" type="int32"/>
         </table>
     </tables>
-</application>
+</application>

models/PageResult_gen.go

@@ -10,9 +10,9 @@ import (
 type PageResult struct {
 	
 	//页码
-	PageNum   int `json:"pageNum"`
+	Page   int `json:"page"`
 	//单页数
-	PageSize   int `json:"pageSize"`
+	Rows   int `json:"rows"`
 	//总页数
 	TotalSize   int64 `json:"totalSize"`
 	//内容

sqlconfig/system_controller/system_find_user_page_count.tpl

@@ -5,3 +5,9 @@ from
     sys_user
 where
 	del_flag = 0
+{{if ne .name ""}}
+    and name like '%{{.name}}%'
+{{end}}
+{{if ne .login_id ""}}
+    and login_id like '%{{.login_id}}%'
+{{end}}

sqlconfig/system_controller/system_find_user_page_select.tpl

@@ -5,3 +5,10 @@ from
     sys_user
 where
     del_flag = 0
+{{if ne .name ""}}
+    and name like '%{{.name}}%'
+{{end}}
+{{if ne .login_id ""}}
+    and login_id like '%{{.login_id}}%'
+{{end}}
+LIMIT {{.rows}} OFFSET {{.offset}}

sqlconfig/system_controller/system_get_org_tree.tpl

@@ -2,4 +2,6 @@
 select
     *
 from
-    
+    sys_org
+where
+    del_flag = 0

sqlconfig/system_controller/system_sidebar.tpl

@@ -2,4 +2,6 @@
 select
     *
 from
-    
+    sys_menu
+where
+    del_flag = 0

utils/page_util.go

@@ -1,26 +1,29 @@
 package utils
 
 import (
-	"github.com/xormplus/xorm"
 	"fmt"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
+	"github.com/xormplus/xorm"
 )
 
 // 分页查询
-func PageSearch(engine *xorm.Engine, controllername string, apiname string, tableName string, paramMap map[string]interface{})(*models.PageResult, error){
+func PageSearch(engine *xorm.Engine, controllername string, apiname string, tableName string, paramMap map[string]interface{}) (*models.PageResult, error) {
 	page := paramMap["page"].(int)
 	rows := paramMap["rows"].(int)
 
-	stplkey := fmt.Sprintf("%s_%s_select.stpl",controllername, apiname)
+	offset := (page - 1) * rows
+	paramMap["offset"] = offset
+
+	stplkey := fmt.Sprintf("%s_%s_select.tpl", controllername, apiname)
 	result, err := engine.SqlTemplateClient(stplkey, &paramMap).Query().List()
-	if err != nil{
+	if err != nil {
 		fmt.Println(err)
 		return nil, err
 	}
 
-	stplkey = fmt.Sprintf("%s_%s_count.stpl", tableName)
+	stplkey = fmt.Sprintf("%s_%s_count.tpl", controllername, apiname)
 	cresult, err := engine.SqlTemplateClient(stplkey, &paramMap).Query().List()
-	if err != nil{
+	if err != nil {
 		fmt.Println(err)
 		return nil, err
 	}
@@ -29,15 +32,15 @@ func PageSearch(engine *xorm.Engine, controllername string, apiname string, tabl
 	var totalSize int64 = 0
 	if records%int64(rows) == 0 {
 		totalSize = records / int64(rows)
-	}else{
-		totalSize = records / int64(rows + 1)
+	} else {
+		totalSize = records / int64(rows+1)
 	}
 
 	presult := models.PageResult{}
-	presult.PageNum = (page)
-	presult.PageSize = (rows)
+	presult.Page = (page)
+	presult.Rows = (rows)
 	presult.Content = result
 	presult.TotalSize = totalSize
 
 	return &presult, nil
-}
+}