Commit f23a1e1d by dong

fix

parent ef02fb91
...@@ -48,7 +48,7 @@ def file_delete(file_del_list, project_id): ...@@ -48,7 +48,7 @@ def file_delete(file_del_list, project_id):
def search_project1(): def search_project1():
req_dic = request.get_json() req_dic = request.get_json()
token = request.headers['token'] # token = request.headers['token']
project_stalker = req_dic['project_stalker'] project_stalker = req_dic['project_stalker']
...@@ -71,12 +71,12 @@ def search_project1(): ...@@ -71,12 +71,12 @@ def search_project1():
per_page = req_dic['per_page'] per_page = req_dic['per_page']
flag = req_dic['flag'] flag = req_dic['flag']
try: # try:
user_obj = verify_token(token) # user_obj = verify_token(token)
user_district = get_district_name(token) # user_district = get_district_name(token)
except Exception as e: # except Exception as e:
current_app.logger.error(e) # current_app.logger.error(e)
return jsonify(code=RET.SESSIONERR, msg="进行操作时用户信息校验失败,请重新登陆后尝试!") # return jsonify(code=RET.SESSIONERR, msg="进行操作时用户信息校验失败,请重新登陆后尝试!")
try: try:
# project_obj = ProjectManagement.query.filter( # project_obj = ProjectManagement.query.filter(
...@@ -98,6 +98,7 @@ def search_project1(): ...@@ -98,6 +98,7 @@ def search_project1():
project_obj = ProjectManagement.query.filter( project_obj = ProjectManagement.query.filter(
# ProjectManagement.district == user_district if user_district != '晋城市' else text(''), # ProjectManagement.district == user_district if user_district != '晋城市' else text(''),
ProjectManagement.district == '满城区',
ProjectManagement.sign_time.notin_(['Null', '']) if flag == 2 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_name.like('%{}%'.format(project_name)) if project_name else text(''),
ProjectManagement.project_stalker == project_stalker if project_stalker else text(''), ProjectManagement.project_stalker == project_stalker if project_stalker else text(''),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment