diff --git a/app/task_db_func.py b/app/task_db_func.py index 8db4f30..95d0120 100644 --- a/app/task_db_func.py +++ b/app/task_db_func.py @@ -40,7 +40,7 @@ class TaskDbHelper(TableDbHelperBase): return tasks[0] def query_task_executor(self, nodeid, area_id): - sql_query = "select user_name, userno from user.user where userno in (select userno from user.area_user where nodeid = '%s' and area_id = %s) and department = '信号调优团队' and state != 1" % (nodeid, area_id) + sql_query = "select user_name, userno, role from user.user where userno in (select userno from user.area_user where nodeid = '%s' and area_id = %s) and department = '信号调优团队' and state != 1" % (nodeid, area_id) executors = self.do_select(sql_query) if len(executors) <= 0: logging.error('query_task_executor is null! %s' % (sql_query)) diff --git a/app/task_worker.py b/app/task_worker.py index bb81f7d..54f4a15 100644 --- a/app/task_worker.py +++ b/app/task_worker.py @@ -77,7 +77,7 @@ def do_query_task_list_parameter(params): for executor in executors: executor_list.append(executor['user_name']) res['data']['executor'] = executor_list - res['data']['usable_user_list'] = executors + res['data']['usable_user_list'] = [{'userno': row['userno'], 'user_name': row['user_name']} for row in executors if row['role'] != 'business_expert'] #需求来源 srcs = db_task.query_task_src(nodeid, area_id)