fix20230201

apps/inves_manage/siku_view.py

@@ -49,7 +49,8 @@ def upload_xiansuo_project(row_content, time_strf, upload_time, upload_unity, up
         investor_district2 = row_content[4]  # 投资方所在地,市
         if investor_district2:
             if investor_district2 in ['北京市', '上海市', '天津市', '重庆市']:
-                return jsonify(code=RET.DATAERR, msg='{} 项目，请按照表格要求填写直辖市和行政区'.format(project_name))
+                # return jsonify(code=RET.DATAERR, msg='{} 项目，请按照表格要求填写直辖市和行政区'.format(project_name))
+                return 'error2'
             investor_district = investor_district1 + '/' + investor_district2
         else:
             investor_district = investor_district1
@@ -822,6 +823,8 @@ def upload_project_data1():
                 return jsonify(code=RET.DATAERR, msg='编号超出三位的规定范围，请联系管理员！')
             elif ret == 'error1':
                 return jsonify(code=RET.DATAERR, msg='数据入库出错，错误位置为第【{}】行！'.format(i))
+            elif ret == 'error2':
+                return jsonify(code=RET.DATAERR, msg='数据入库出错，错误位置为第【{}】行！请按照表格要求填写直辖市和行政区。'.format(i))
             else:
                 pass
     if int(data_type) == 2:  # 更新对接库