Merge branch 'dev/v4.8.78_dx' of qmx/jy into feature/v4.8.78

src/jfw/front/dataExport.go

@@ -223,18 +223,21 @@ func (d *DataExport) SieveData() {
 			"error_code": -1,
 			"error_msg":  fmt.Sprintf("关键词信息超过上限%d", countLimit),
 		})
+		return
 	}
 	if len(buyerArr) > buyerLimit {
 		d.ServeJson(map[string]interface{}{
 			"error_code": -1,
 			"error_msg":  fmt.Sprintf("采购单位超过上限%d", buyerLimit),
 		})
+		return
 	}
 	if len(winnerArr) > winnerLimit {
 		d.ServeJson(map[string]interface{}{
 			"error_code": -1,
 			"error_msg":  fmt.Sprintf("中标单位超过上限%d", winnerLimit),
 		})
+		return
 	}
 	sieveCondition := map[string]interface{}{
 		"publishtime": publishtime,

src/jfw/front/wx_dataExport.go

@@ -211,6 +211,7 @@ func (w *WxDataExport) SaveData() error {
 					"error_code": -1,
 					"error_msg":  fmt.Sprintf("关键词信息超过上限%d", countLimit),
 				})
+				return nil
 			}
 		} else {
 			log.Println("keyWord param 反序列化异常，查看前后台字段是否对应")
@@ -247,12 +248,14 @@ func (w *WxDataExport) SaveData() error {
 			"error_code": -1,
 			"error_msg":  fmt.Sprintf("采购单位超过上限%d", buyerLimit),
 		})
+		return nil
 	}
 	if len(winnerArr) > winnerLimit {
 		w.ServeJson(map[string]interface{}{
 			"error_code": -1,
 			"error_msg":  fmt.Sprintf("中标单位超过上限%d", winnerLimit),
 		})
+		return nil
 	}
 	saveData := map[string]interface{}{
 		"publishtime": publishtime,

src/jfw/modules/app/src/app/front/dataExport.go

@@ -218,6 +218,7 @@ func (w *WxDataExport) SaveData() error {
 					"error_code": -1,
 					"error_msg":  fmt.Sprintf("关键词信息超过上限%d", countLimit),
 				})
+				return nil
 			}
 		}
 	}
@@ -252,12 +253,14 @@ func (w *WxDataExport) SaveData() error {
 			"error_code": -1,
 			"error_msg":  fmt.Sprintf("采购单位超过上限%d", buyerLimit),
 		})
+		return nil
 	}
 	if len(winnerArr) > winnerLimit {
 		w.ServeJson(map[string]interface{}{
 			"error_code": -1,
 			"error_msg":  fmt.Sprintf("中标单位超过上限%d", winnerLimit),
 		})
+		return nil
 	}
 	saveData := map[string]interface{}{
 		"publishtime": publishtime,