|
|
|
@ -60,6 +60,10 @@ func (a *ApiMethod) GainFormPageListContNew(c *gin.Context) { |
|
|
|
if requestData.PageSize == 0 { |
|
|
|
requestData.Page = 20 |
|
|
|
} |
|
|
|
|
|
|
|
if requestData.SortData == "" { |
|
|
|
requestData.SortData = "`id` DESC" |
|
|
|
} |
|
|
|
context, _ := c.Get(overall.MyContJwt) |
|
|
|
var userCont modelshr.ManCont |
|
|
|
userCont.GetLoginCont(context) //当前操作人
|
|
|
|
@ -123,7 +127,8 @@ func (a *ApiMethod) GainFormPageListContNew(c *gin.Context) { |
|
|
|
//Step 5 获取每页具体数据
|
|
|
|
var formList []map[string]interface{} |
|
|
|
gormDb = publicmethod.PageTurningSettings(gormDb, requestData.Page, requestData.PageSize) |
|
|
|
err = gormDb.Order("`id` DESC").Find(&formList).Error |
|
|
|
|
|
|
|
err = gormDb.Order(requestData.SortData).Find(&formList).Error |
|
|
|
if err != nil && len(formList) < 1 { |
|
|
|
publicmethod.Result(0, err, c) |
|
|
|
return |
|
|
|
@ -206,7 +211,7 @@ func (a *ApiMethod) GainFormPageListContNew(c *gin.Context) { |
|
|
|
} |
|
|
|
//Step 4 翻页配置
|
|
|
|
gormDb = publicmethod.PageTurningSettings(gormDb, requestData.Page, requestData.PageSize) |
|
|
|
err = gormDb.Order("f.`id` DESC").Find(&formList).Error |
|
|
|
err = gormDb.Order(requestData.SortData).Find(&formList).Error |
|
|
|
fmt.Printf("err----%v------->%v\n\n\n", formJsonCont.Form.DataSource, err) |
|
|
|
if err != nil && len(formList) < 1 { |
|
|
|
publicmethod.Result(0, err, c) |
|
|
|
|