fix20230201

apps/view_choose/fill_data.py

@@ -12,6 +12,7 @@ from apps.util import verify_token, verify_identity
 
 
 from apps.view_choose import api_address
 from apps.view_choose import api_address
 from apps.utils.response_code import RET
 from apps.utils.response_code import RET
+from apps.view_choose.choose_view import get_district_name
 
 
 """数据填报页面"""
 """数据填报页面"""
 
 
@@ -1700,6 +1701,8 @@ def search_carrier_build():
 
 
     build_name = req_dic['build_name']
     build_name = req_dic['build_name']
     district_name = req_dic['district_name']
     district_name = req_dic['district_name']
+    if not district_name:
+        district_name = get_district_name(token)
     build_type = req_dic['build_type']
     build_type = req_dic['build_type']
 
 
     page = req_dic['page']
     page = req_dic['page']
@@ -1909,6 +1912,8 @@ def search_carrier_land():
     #     return jsonify(code=RET.SESSIONERR, msg="进行{}操作时用户信息校验失败，请重新登陆后尝试！".format(action_name))
     #     return jsonify(code=RET.SESSIONERR, msg="进行{}操作时用户信息校验失败，请重新登陆后尝试！".format(action_name))
 
 
     district_name = req_dic['district_name']
     district_name = req_dic['district_name']
+    if not district_name:
+        district_name = get_district_name(token)
     land_name = req_dic['land_name']
     land_name = req_dic['land_name']
     land_code = req_dic['land_code']
     land_code = req_dic['land_code']
 
 
@@ -2092,7 +2097,7 @@ def search_carrier_factory():
     req_dic = request.get_json()
     req_dic = request.get_json()
 
 
     # token = req_dic['token']
     # token = req_dic['token']
-    # token = request.headers['token']
+    token = request.headers['token']
     # action_name = '搜索厂房'
     # action_name = '搜索厂房'
     # try:
     # try:
     #     section, user_name, operation_mobile, user_id, belong_unit = verify_identity(token, action_name)
     #     section, user_name, operation_mobile, user_id, belong_unit = verify_identity(token, action_name)
@@ -2100,6 +2105,8 @@ def search_carrier_factory():
     #     current_app.logger.error(e)
     #     current_app.logger.error(e)
     #     return jsonify(code=RET.SESSIONERR, msg="进行{}操作时用户信息校验失败，请重新登陆后尝试！".format(action_name))
     #     return jsonify(code=RET.SESSIONERR, msg="进行{}操作时用户信息校验失败，请重新登陆后尝试！".format(action_name))
     district_name = req_dic['district_name']
     district_name = req_dic['district_name']
+    if not district_name:
+        district_name = get_district_name(token)
     factory_name = req_dic['factory_name']
     factory_name = req_dic['factory_name']
     is_standard = req_dic['is_standard']
     is_standard = req_dic['is_standard']