maxiaoshan před 3 roky
rodič
revize
85162e9e59
3 změnil soubory, kde provedl 5 přidání a 4 odebrání
  1. 2 2
      src/front/mark.go
  2. 2 2
      src/front/project.go
  3. 1 0
      src/util/config.go

+ 2 - 2
src/front/mark.go

@@ -111,9 +111,9 @@ func (f *Front) JyMarkList() {
 		} else if !fieldScreen && notag {
 			query["i_ckdata"] = 0
 		}
-		qu.Debug("query:", query, sourceInfo)
-		list, _ := util.Mgo.Find(sourceInfo, query, map[string]interface{}{"_id": 1}, nil, false, start, limit)
 		count := util.Mgo.Count(sourceInfo, query)
+		qu.Debug("query:", query, sourceInfo, count)
+		list, _ := util.Mgo.Find(sourceInfo, query, map[string]interface{}{"_id": 1}, nil, false, start, limit)
 		//checkedNum, allNum := GetCheckedAndAllDataInfo(query, coll) //已标和总数信息
 		f.ServeJson(map[string]interface{}{"draw": draw, "data": *list, "recordsFiltered": count, "recordsTotal": count})
 	} else {

+ 2 - 2
src/front/project.go

@@ -180,12 +180,12 @@ func (f *Front) ProjectSave() {
 			msg = "保存项目成功"
 		}
 	}
-	qu.Debug("Create Project:", success, "importnum:", importDataNum, "successnum:", successNum, "failnum:", int64(importDataNum)-successNum)
 	//qu.Debug("Msg:", msg)
 	//返回信息
 	if stype == "edit" {
 		f.ServeJson(map[string]interface{}{"success": success, "msg": msg})
 	} else {
+		qu.Debug("Create Project:", success, "importnum:", importDataNum, "successnum:", successNum, "failnum:", int64(importDataNum)-successNum)
 		f.ServeJson(map[string]interface{}{"success": success, "msg": msg, "importnum": importDataNum, "successnum": successNum, "failnum": int64(importDataNum) - successNum})
 	}
 }
@@ -976,7 +976,7 @@ func GetDataById(idInfoArr []util.Data, importType, s_sourceinfo string, success
 	for i, data := range idInfoArr {
 		wg.Add(1)
 		ch <- true
-		func(index int, tmpData util.Data) {
+		go func(index int, tmpData util.Data) {
 			defer func() {
 				wg.Done()
 				<-ch

+ 1 - 0
src/util/config.go

@@ -60,6 +60,7 @@ var SourceInfoIndexArr = []mongo.IndexModel{
 	mongo.IndexModel{Keys: map[string]interface{}{"b_isgivegroup": 1, "s_isgiveuser": 1, "b_istag": 1}},
 	mongo.IndexModel{Keys: map[string]interface{}{"b_isgivegroup": 1, "s_isgiveuser": 1, "b_istagging": 1}},
 	mongo.IndexModel{Keys: map[string]interface{}{"b_isgivegroup": 1, "s_isgiveuser": 1, "i_ckdata": 1}},
+	mongo.IndexModel{Keys: map[string]interface{}{"b_isgivegroup": 1, "s_isgiveuser": 1, "i_ckdata": 1, "b_istagging": 1}},
 }
 
 const JYHREFPRE = "https://www.jianyu360.cn/article/content/"