浏览代码

修改page_util.go或取为空时返回空数组,修改创建工作流接口

huangyh 6 年之前
父节点
当前提交
bf6a1706c5
共有 2 个文件被更改,包括 12 次插入2 次删除
  1. 8 2
      utils/page_util.go
  2. 4 0
      wfclient/client.go

+ 8 - 2
utils/page_util.go

@@ -1,7 +1,6 @@
 package utils
 
 import (
-	"errors"
 	"fmt"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 	"github.com/xormplus/xorm"
@@ -31,7 +30,14 @@ func PageSearch(engine *xorm.Engine, controllername string, apiname string, tabl
 
 	// 无数据
 	if result == nil {
-		return nil, errors.New("no find rows")
+		presult := models.PageResult{}
+		content := []interface{}{}
+		presult.Page = (page)
+		presult.Rows = (rows)
+		presult.Content = content
+		presult.TotalSize = 0
+		presult.TotalPageSize = 0
+		return &presult, nil
 	}
 
 	records := cresult[0]["records"].(int64)

+ 4 - 0
wfclient/client.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
 	"net/http"
 	"strconv"
 	"strings"
@@ -109,6 +110,9 @@ func (w *WFClient) AddCallback(key string, cb func(CallbackArg)) {
  * @return1 information of error
  */
 func (w *WFClient) CreateOrUpdateDefine(defineId, defineName, defineDesc, diagram, formName, tag, code string) ([]byte, error) {
+	if defineId == "" {
+		defineId = utils.NewUUID()
+	}
 	url := w.getFullUrl(fmt.Sprintf("api/wf_define/%s", defineId))
 	fmt.Println("----url:", url)
 	params := make(map[string]string)