fix20221202

apps/inves_manage/siku_view.py

@@ -151,7 +151,7 @@ def update_joint_project(row_content):
         remark = row_content[21]  # 备注
         remark = row_content[21]  # 备注
 
 
         project_obj = SikuProject.query.filter_by(
         project_obj = SikuProject.query.filter_by(
-            project_num=project_num, project_name=project_name).first()  # 项目编号
+            project_num=project_num).first()  # 项目编号
 
 
         # 更新项目信息
         # 更新项目信息
         project_obj.project_name = project_name
         project_obj.project_name = project_name
@@ -226,7 +226,7 @@ def update_sign_project(row_content):
         remark = row_content[28]  # 备注
         remark = row_content[28]  # 备注
 
 
         project_obj = SikuProject.query.filter_by(
         project_obj = SikuProject.query.filter_by(
-            project_num=project_num, project_name=project_name).first()  # 项目编号
+            project_num=project_num).first()  # 项目编号
 
 
         # 更新项目信息
         # 更新项目信息
         project_obj.project_name = project_name
         project_obj.project_name = project_name
@@ -309,7 +309,7 @@ def update_star_project(row_content):
         remark = row_content[25]  # 备注
         remark = row_content[25]  # 备注
 
 
         project_obj = SikuProject.query.filter_by(
         project_obj = SikuProject.query.filter_by(
-            project_num=project_num, project_name=project_name).first()  # 项目编号
+            project_num=project_num).first()  # 项目编号
 
 
         # 更新项目信息
         # 更新项目信息
         project_obj.project_num = project_num
         project_obj.project_num = project_num
@@ -462,7 +462,7 @@ def search_project():
 
 
     try:
     try:
         project_obj = SikuProject.query.filter(
         project_obj = SikuProject.query.filter(
-            SikuProject.flag == flag if flag != 1 else text(''),  # 线索库包含所有阶段的项目
+            SikuProject.flag >= flag if flag else text(''),  # 线索库包含所有阶段的项目
             SikuProject.is_delete == 0,
             SikuProject.is_delete == 0,
             SikuProject.distribute_condition._in(distribute_condition_list) if distribute_condition_list else SikuProject.distribute_condition == distribute_condition if distribute_condition else text(''),
             SikuProject.distribute_condition._in(distribute_condition_list) if distribute_condition_list else SikuProject.distribute_condition == distribute_condition if distribute_condition else text(''),
             SikuProject.project_name == project_name if project_name else text(''),
             SikuProject.project_name == project_name if project_name else text(''),