wangkaiyue 4 роки тому
батько
коміт
0d667d2ae6

+ 10 - 0
src/jfw/modules/publicapply/src/enterpriseSearch/entity/entQuery.go

@@ -139,5 +139,15 @@ func (es *EnterpriseSearch) DoQuery() (list *[]map[string]interface{}, total int
 	}
 	sql = sql[:len(sql)-1] + fmt.Sprintf(`,"from":%d,"size":%d}"`, start, limit)
 	list = elastic.Get(index, itype, sql)
+	//格式化字段,加密id
+	if list != nil {
+		for index, _ := range *list {
+			encodeId := ""
+			if encode := qutil.DecodeArticleId2ByCheck(qutil.ObjToString((*list)[index]["id"])); len(encode) > 0 {
+				encodeId = encode[0]
+			}
+			(*list)[index]["id"] = encodeId
+		}
+	}
 	return
 }

+ 11 - 0
src/jfw/modules/publicapply/src/enterpriseSearch/init.go

@@ -0,0 +1,11 @@
+package enterpriseSearch
+
+import (
+	"enterpriseSearch/service"
+
+	"github.com/go-xweb/xweb"
+)
+
+func init() {
+	xweb.AddAction(&service.EnterpriseSearchAction{})
+}

+ 0 - 8
src/jfw/modules/publicapply/src/enterpriseSearch/service/search.go

@@ -46,14 +46,6 @@ func (esa *EnterpriseSearchAction) DoEntSearch() {
 		if err != nil {
 			return nil, err
 		}
-		//格式化字段,加密id
-		if searchList != nil { //company_name、company_status、legal_person、capital、company_address、id
-			for index, _ := range *searchList {
-				if id := qutil.ObjToString((*searchList)[index]["id"]); id != "" {
-					(*searchList)[index]["id"] = qutil.DecodeArticleId2ByCheck(id)[0]
-				}
-			}
-		}
 		return map[string]interface{}{
 			"total": total,
 			"list":  searchList,