Merge branch 'dev_v2.9.36_wh' of jianyu/ent_new into feature/v2.9.36

entniche_new/src/service/subscribe/subscribe.go

@@ -454,6 +454,7 @@ func (ac *Action) Subscribe_index() error {
 			//省份设置
 			if ent_dis == nil {
 				subscribe["area"] = entniche["o_area"]
+				subscribe["district"] = entniche["o_district"]
 				//行业
 				subscribe["buyerclass"] = entniche["a_buyerclass"]
 				//关键词分类
@@ -467,6 +468,7 @@ func (ac *Action) Subscribe_index() error {
 				subscribe["items"] = a_items
 			} else {
 				subscribe["area"] = (*ent_dis)["o_area"]
+				subscribe["district"] = (*ent_dis)["o_district"]
 				subscribe["buyerclass"] = (*ent_dis)["a_buyerclass"]
 				subscribe["items"] = (*ent_dis)["a_items"]
 			}
@@ -493,12 +495,12 @@ func (ac *Action) Subscribe_index() error {
 	}
 	//区域格式化
 	regionMap := map[string]map[string][]string{}
-	if subscribe["o_area"] != nil {
+	if subscribe["area"] != nil {
 		district := map[string]interface{}{}
-		if subscribe["o_district"] != nil {
-			district = *qutil.ObjToMap(subscribe["o_district"])
+		if subscribe["district"] != nil {
+			district = *qutil.ObjToMap(subscribe["district"])
 		}
-		o_area := subscribe["o_area"]
+		o_area := subscribe["area"]
 		for k, v := range *qutil.ObjToMap(o_area) {
 			areaMap := map[string][]string{}
 			if k == "北京" || k == "天津" || k == "上海" || k == "重庆" {