处理后台管理系统、修复BUG、处理权限
This commit is contained in:
Binary file not shown.
@@ -406,12 +406,13 @@ def list_users():
|
||||
search_username = (request.args.get('username') or request.args.get('search') or '').strip()
|
||||
created_by_id_arg = request.args.get('created_by_id') or request.args.get('admin_id')
|
||||
created_by_id = int(created_by_id_arg) if created_by_id_arg and str(created_by_id_arg).isdigit() else None
|
||||
if role != 'super_admin':
|
||||
can_view_all_users = role == 'super_admin' or (current_row and (current_row.get('username') or '').strip().lower() == 'admin')
|
||||
if not can_view_all_users:
|
||||
created_by_id = None
|
||||
try:
|
||||
conn = get_db()
|
||||
with conn.cursor() as cur:
|
||||
if role == 'super_admin':
|
||||
if can_view_all_users:
|
||||
where_parts = ["1=1"]
|
||||
params = []
|
||||
if search_username:
|
||||
@@ -1526,6 +1527,11 @@ def list_shop_manage_groups():
|
||||
{
|
||||
'id': item.get('id'),
|
||||
'group_name': item.get('groupName') or '',
|
||||
'leader_user_id': item.get('leaderUserId'),
|
||||
'leader_username': item.get('leaderUsername') or '',
|
||||
'member_user_ids': item.get('memberUserIds') or [],
|
||||
'member_usernames': item.get('memberUsernames') or [],
|
||||
'member_count': item.get('memberCount') or 0,
|
||||
'user_id': item.get('userId'),
|
||||
'username': item.get('username') or '',
|
||||
'created_at': (item.get('createdAt') or '').replace('T', ' ')[:16],
|
||||
@@ -1545,7 +1551,7 @@ def create_shop_manage_group():
|
||||
data = request.get_json() or {}
|
||||
payload = {
|
||||
'groupName': (data.get('group_name') or '').strip(),
|
||||
'userId': data.get('user_id'),
|
||||
'memberUserIds': data.get('member_user_ids') or [],
|
||||
'createdById': current_row.get('id') if current_row else None,
|
||||
}
|
||||
result, error_response, status = _proxy_backend_java(
|
||||
@@ -1566,6 +1572,11 @@ def create_shop_manage_group():
|
||||
'item': {
|
||||
'id': item.get('id'),
|
||||
'group_name': item.get('groupName') or '',
|
||||
'leader_user_id': item.get('leaderUserId'),
|
||||
'leader_username': item.get('leaderUsername') or '',
|
||||
'member_user_ids': item.get('memberUserIds') or [],
|
||||
'member_usernames': item.get('memberUsernames') or [],
|
||||
'member_count': item.get('memberCount') or 0,
|
||||
'user_id': item.get('userId'),
|
||||
'username': item.get('username') or '',
|
||||
'created_at': (item.get('createdAt') or '').replace('T', ' ')[:16],
|
||||
@@ -1583,7 +1594,7 @@ def update_shop_manage_group(item_id):
|
||||
data = request.get_json() or {}
|
||||
payload = {
|
||||
'groupName': (data.get('group_name') or '').strip(),
|
||||
'userId': data.get('user_id'),
|
||||
'memberUserIds': data.get('member_user_ids') or [],
|
||||
}
|
||||
result, error_response, status = _proxy_backend_java(
|
||||
'PUT',
|
||||
@@ -1603,6 +1614,11 @@ def update_shop_manage_group(item_id):
|
||||
'item': {
|
||||
'id': item.get('id'),
|
||||
'group_name': item.get('groupName') or '',
|
||||
'leader_user_id': item.get('leaderUserId'),
|
||||
'leader_username': item.get('leaderUsername') or '',
|
||||
'member_user_ids': item.get('memberUserIds') or [],
|
||||
'member_usernames': item.get('memberUsernames') or [],
|
||||
'member_count': item.get('memberCount') or 0,
|
||||
'user_id': item.get('userId'),
|
||||
'username': item.get('username') or '',
|
||||
'created_at': (item.get('createdAt') or '').replace('T', ' ')[:16],
|
||||
|
||||
Reference in New Issue
Block a user