fix20230201

apps/view_choose/choose_view.py

@@ -119,7 +119,7 @@ def global_land(key_words, district_name, land_name, land_nature, industry_name,
         return data
         return data
 
 
 
 
-# 楼宇公共方法
+# 厂房公共方法
 def global_factory(key_words, district_name, factory_name, industry_name, page, per_page):
 def global_factory(key_words, district_name, factory_name, industry_name, page, per_page):
     try:
     try:
         if key_words:
         if key_words:
@@ -268,8 +268,8 @@ def search_land():
     page = req_dict.get("page")  # 页码
     page = req_dict.get("page")  # 页码
     per_page = int(req_dict.get("per_page"))  # 每页大小
     per_page = int(req_dict.get("per_page"))  # 每页大小
     token = request.headers['token']
     token = request.headers['token']
-
-    district_name = get_district_name(token)
+    if not district_name:
+        district_name = get_district_name(token)
     data = global_land(key_words, district_name, land_name, land_nature, industry_name, page, per_page)
     data = global_land(key_words, district_name, land_name, land_nature, industry_name, page, per_page)
     return jsonify(data)
     return jsonify(data)
 
 
@@ -279,14 +279,15 @@ def search_land():
 def search_factory():
 def search_factory():
     req_dict = request.get_json()
     req_dict = request.get_json()
     key_words = req_dict['key_words']  # 关键字
     key_words = req_dict['key_words']  # 关键字
-    district_name = req_dict['district_name']  # 区域名称
     factory_name = req_dict['factory_name']  # 厂房名称
     factory_name = req_dict['factory_name']  # 厂房名称
     industry_name = req_dict['industry_name']  # 产业类型
     industry_name = req_dict['industry_name']  # 产业类型
     page = req_dict.get("page")  # 页码
     page = req_dict.get("page")  # 页码
     per_page = int(req_dict.get("per_page"))  # 每页大小
     per_page = int(req_dict.get("per_page"))  # 每页大小
     token = request.headers['token']
     token = request.headers['token']
 
 
-    district_name = get_district_name(token)
+    district_name = req_dict['district_name']  # 区域名称
+    if not district_name:
+        district_name = get_district_name(token)
 
 
     data = global_factory(key_words, district_name, factory_name, industry_name, page, per_page)
     data = global_factory(key_words, district_name, factory_name, industry_name, page, per_page)
     return jsonify(data)
     return jsonify(data)
@@ -304,8 +305,8 @@ def search_build():
     page = req_dict.get("page")  # 页码
     page = req_dict.get("page")  # 页码
     per_page = int(req_dict.get("per_page"))  # 每页大小
     per_page = int(req_dict.get("per_page"))  # 每页大小
     token = request.headers['token']
     token = request.headers['token']
-
-    district_name = get_district_name(token)
+    if not district_name:
+        district_name = get_district_name(token)
     data = global_build(key_words, district_name, build_name, industry_name, build_type, page, per_page)
     data = global_build(key_words, district_name, build_name, industry_name, build_type, page, per_page)
     return jsonify(data)
     return jsonify(data)
 
 
@@ -320,9 +321,10 @@ def search_all():
     industry_name = req_dict['industry_name']  # 产业类型名称
     industry_name = req_dict['industry_name']  # 产业类型名称
     page = req_dict.get("page")  # 页码
     page = req_dict.get("page")  # 页码
     per_page = int(req_dict.get("per_page"))  # 每页大小
     per_page = int(req_dict.get("per_page"))  # 每页大小
-
     token = request.headers['token']
     token = request.headers['token']
-    district_name = get_district_name(token)
+
+    if not district_name:
+        district_name = get_district_name(token)
 
 
     data_list = []
     data_list = []
     if carrier_type_id == 0:
     if carrier_type_id == 0: