Merge branch 'dev_v4.9.69_wh1' of qmx/jy into feature/v4.9.69

src/jfw/modules/publicapply/src/subscribe/entity/entity.go

@@ -284,8 +284,10 @@ func HistorySearch(userId string) (string, string, string) {
 		area = gconv.String(v["area"])
 		city = gconv.String(v["city"])
 		district = gconv.String(v["district"])
-		if area == "" || area != "全国" {
+		if area == "" || area == "全国" {
 			continue
+		} else {
+			break
 		}
 	}
 	if area != "" {