From 96b812121049c65aa78c1216c6e1c1a49fb0ad9c Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Sat, 14 Sep 2024 05:54:55 +0800
Subject: [PATCH] return at least one chat role for getUserRoles API

---
 api/handler/admin/user_handler.go | 2 +-
 api/handler/chat_role_handler.go  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/api/handler/admin/user_handler.go b/api/handler/admin/user_handler.go
index 6cd03e6a..4c247fbe 100644
--- a/api/handler/admin/user_handler.go
+++ b/api/handler/admin/user_handler.go
@@ -269,7 +269,7 @@ func (h *UserHandler) Remove(c *gin.Context) {
 		}
 	}
 	if err != nil {
-		resp.ERROR(c, "删除失败")
+		resp.ERROR(c, err.Error())
 		tx.Rollback()
 		return
 	}
diff --git a/api/handler/chat_role_handler.go b/api/handler/chat_role_handler.go
index 8ef899be..aa579a51 100644
--- a/api/handler/chat_role_handler.go
+++ b/api/handler/chat_role_handler.go
@@ -69,7 +69,10 @@ func (h *ChatRoleHandler) ListByUser(c *gin.Context) {
 			resp.ERROR(c, "角色解析失败！")
 			return
 		}
-		session = session.Where("marker IN ?", roleKeys)
+		// 保证用户至少有一个角色可用
+		if len(roleKeys) > 0 {
+			session = session.Where("marker IN ?", roleKeys)
+		}
 	}
 
 	if id > 0 {