fix20230113

apps/inves_manage/project_manager.py

@@ -434,7 +434,7 @@ def upload_project_data2():
 
 
     if success_num > 0:
     if success_num > 0:
         return jsonify(code=RET.OK,
         return jsonify(code=RET.OK,
-                       msg='上传成功！数据上传 {} 条数据，{}已存在同名项目未上传。'.format(success_num, rep_project_name_list))
+                       msg='上传成功！数据上传 {} 条数据，{}已存在同名项目。'.format(success_num, rep_project_name_list))
     else:
     else:
         return jsonify(code=RET.DATAERR, msg='无新数据上传。')
         return jsonify(code=RET.DATAERR, msg='无新数据上传。')
 
 

apps/inves_manage/siku_view.py

@@ -491,8 +491,8 @@ def search_project():
         project_obj = SikuProject.query.filter(
         project_obj = SikuProject.query.filter(
             SikuProject.flag >= flag if flag else text(''),  # 线索库包含所有阶段的项目
             SikuProject.flag >= flag if flag else text(''),  # 线索库包含所有阶段的项目
             SikuProject.is_delete == 0,
             SikuProject.is_delete == 0,
-            SikuProject.project_to_area == user_district if flag == 2 and user_district != '晋城市' else text(''),
-            SikuProject.project_to_area1 == user_district if flag in [3, 4] and user_district != '晋城市' else text(''),
+            SikuProject.project_to_area == user_district if flag in [2, 3, 4] and user_district != '晋城市' else text(''),
+            # SikuProject.project_to_area1 == user_district if flag in [3, 4] and user_district != '晋城市' else text(''),
             SikuProject.distribute_condition.in_(distribute_condition_list) if distribute_condition_list
             SikuProject.distribute_condition.in_(distribute_condition_list) if distribute_condition_list
             else SikuProject.distribute_condition == distribute_condition if distribute_condition else text(''),
             else SikuProject.distribute_condition == distribute_condition if distribute_condition else text(''),
             SikuProject.project_name.like('%{}%'.format(project_name)) if project_name else text(''),
             SikuProject.project_name.like('%{}%'.format(project_name)) if project_name else text(''),