fix20230113

apps/inves_manage/project_manager.py

@@ -20,6 +20,7 @@ from apps.util import verify_token
 
 # 项目管理---项目列表
 from apps.inves_manage.siku_view import get_num, upload_daily_picture
+from apps.view_choose.choose_view import get_district_name
 
 """台账管理"""
 
@@ -71,7 +72,7 @@ def search_project1():
 
     try:
         user_obj = verify_token(token)
-        user_id = user_obj.id
+        user_district = get_district_name(token)
     except Exception as e:
         current_app.logger.error(e)
         return jsonify(code=RET.SESSIONERR, msg="进行操作时用户信息校验失败，请重新登陆后尝试！")
@@ -95,6 +96,7 @@ def search_project1():
         # )
 
         project_obj = ProjectManagement.query.filter(
+            ProjectManagement.district == user_district if user_district != '晋城市' else text(''),
             ProjectManagement.sign_time.notin_(['Null', '']) if flag == 2 else text(''),
             ProjectManagement.project_name.like('%{}%'.format(project_name)) if project_name else text(''),
             ProjectManagement.project_stalker == project_stalker if project_stalker else text(''),

apps/view_choose/map_view.py

@@ -15,22 +15,6 @@ from apps.util import verify_token
 """产业地图页面"""
 
 
-def get_district_name(token, industry_name):
-    try:
-        user = verify_token(token)
-        user_id = user.id  # 用户id
-        # 查出做此操作的用户名
-        user_obj = User.query.get(user_id)
-        district_name1 = user_obj.district_name  # 所属区县
-        if district_name1 == '太原市':
-            return industry_name
-        else:
-            return district_name1
-    except Exception as e:
-        current_app.logger.error(e)
-        return jsonify(code=RET.SESSIONERR, msg="token过期，请重新登录！")
-
-
 # 展示中间右半部分载体面积
 @api_address.route("/ShowArea", methods=["POST"])
 def show_area():