From 07d38821009affe4b7259c41b70bb41d8bf01c09 Mon Sep 17 00:00:00 2001 From: wangxu <1318272526@qq.com> Date: Tue, 11 Nov 2025 18:08:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9getuserinfo=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E5=86=85=E8=BE=96=E5=8C=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/user_worker.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/user_worker.py b/app/user_worker.py index a157cde..74bc97f 100644 --- a/app/user_worker.py +++ b/app/user_worker.py @@ -9,12 +9,12 @@ def query_host_by_nodeid(params): nodeid = check_param(params, 'nodeid') if not nodeid: return json.dumps(make_common_res(1, 'nodeid is missing')) - host = g_node2host.get_host(nodeid) - if not host: - return json.dumps(make_common_res(2, 'no host for this nodeid')) + # host = g_node2host.get_host(nodeid) + # if not host: + # return json.dumps(make_common_res(2, 'no host for this nodeid')) res = make_common_res(0, 'ok') res['nodeid'] = nodeid - res['host'] = ScoNodeConfig.host2str(host) + # res['host'] = ScoNodeConfig.host2str(host) return json.dumps(res) @@ -79,12 +79,17 @@ def do_get_user_info(params, token): if token is None: res = make_common_res(-1, '鉴权失败，请检查是否已经登录。') return json.dumps(res) - + all_area_info = db_user.query_all_area_infos() user = db_user.query_user(token) if user is not None: user_t = {'userno': user['userno'], 'user_name': user['user_name'], 'role': user['role'], 'department': user['department']} + user_area_ids = db_user.query_areaid_list(user['userno']) + user_area_info = [] + for area_id in user_area_ids: + user_area_info.append(all_area_info[area_id]) res = make_common_res(0, 'ok') + res['data'] = user_area_info res['token'] = user_t res['desc'] = '' else: