Merge branch 'dev/v4.8.94_dx' of qmx/jy into release/v4.8.94

src/jfw/modules/bigmember/src/service/analysis/forecastproject.go

@@ -597,22 +597,26 @@ func getNewForecast(userId string, pageNum int, o_member_jy map[string]interface
 	if list != nil {
 		d.AddWord(keys...)
 		for _, v := range list {
+			rsvMap := map[string]bool{}
 			var rsArr = []string{}
 			var rsArrRes = []string{}
-			if v["results"] != nil {
-				results := qutil.ObjArrToMapArr(v["results"].([]interface{}))
-				rsvMap := map[string]bool{}
-				for _, rsv := range results {
-					rsArr = append(rsArr, d.Analy(rsv["purchasing"].(string))...)
-				}
-				for _, rv := range rsArr {
-					if rsvMap[strings.Join(rsArr, "+")] {
-						continue
+			if dataType == "nj" {
+				rsArr = append(rsArr, d.Analy(qutil.InterfaceToStr(v["title"]))...)
+			} else {
+				if v["results"] != nil {
+					results := qutil.ObjArrToMapArr(v["results"].([]interface{}))
+					for _, rsv := range results {
+						rsArr = append(rsArr, d.Analy(rsv["purchasing"].(string))...)
 					}
-					rsArrRes = append(rsArrRes, rv)
-					rsvMap[strings.Join(rsArr, "+")] = true
 				}
 			}
+			for _, rv := range rsArr {
+				if rsvMap[strings.Join(rsArr, "+")] {
+					continue
+				}
+				rsArrRes = append(rsArrRes, rv)
+				rsvMap[strings.Join(rsArr, "+")] = true
+			}
 			v["results"] = rsArrRes
 			v["id"] = qutil.ObjToString(v["_id"])
 			v["yucetime"] = qutil.Int64All(v["yucetime"].(float64))