Feat/0.3.2 (#712)

dataelement · Jun 28, 2024 · f583cd0 · f583cd0
2 parents c7b2cfc + 49c3dc4
commit f583cd0
Show file tree

Hide file tree

Showing 34 changed files with 607 additions and 90 deletions.
diff --git a/src/backend/bisheng/api/services/role_group_service.py b/src/backend/bisheng/api/services/role_group_service.py
@@ -10,6 +10,7 @@
 from bisheng.api.services.user_service import UserPayload
 from bisheng.api.errcode.user import UserGroupNotDeleteError
 from bisheng.api.utils import get_request_ip
+from bisheng.api.v1.schemas import resp_200
 from bisheng.database.models.assistant import AssistantDao
 from bisheng.database.models.flow import FlowDao
 from bisheng.database.models.gpts_tools import GptsToolsDao
@@ -91,15 +92,17 @@ def delete_group(self, request: Request, login_user: UserPayload, group_id: int)
         """删除用户组"""
         group_info = GroupDao.get_user_group(group_id)
         if not group_info:
-            return None
+            return resp_200()
 
         # 判断组下是否还有用户
         user_group_list = UserGroupDao.get_group_user(group_id)
         if user_group_list:
             return UserGroupNotDeleteError.return_resp()
         GroupDao.delete_group(group_id)
+        self.delete_group_hook(request, login_user, group_info)
+        return resp_200()
 
-    def delete_group_hook(self, request: Request, login_user: UserPayload, group_info: int):
+    def delete_group_hook(self, request: Request, login_user: UserPayload, group_info: Group):
         logger.info(f'act=delete_group_hook user={login_user.user_name} group_id={group_info.id}')
         # 记录审计日志
         AuditLogService.delete_user_group(login_user, get_request_ip(request), group_info)
@@ -109,8 +112,8 @@ def delete_group_hook(self, request: Request, login_user: UserPayload, group_inf
         need_move_resource = []
         for one in all_resource:
             # 获取资源属于几个组,属于多个组则不用处理, 否则将资源转移到默认用户组
-            resourece_groups = GroupResourceDao.get_resource_group(ResourceTypeEnum(one.type), one.third_id)
-            if len(resourece_groups) > 1:
+            resource_groups = GroupResourceDao.get_resource_group(ResourceTypeEnum(one.type), one.third_id)
+            if len(resource_groups) > 1:
                 continue
             else:
                 one.group_id = DefaultGroup

diff --git a/src/backend/bisheng/api/v1/usergroup.py b/src/backend/bisheng/api/v1/usergroup.py
@@ -82,7 +82,7 @@ async def delete_group(request: Request,
 
     if not login_user.is_admin():
         return UnAuthorizedError.return_resp()
-    return resp_200(RoleGroupService().delete_group(request, login_user, group_id))
+    return RoleGroupService().delete_group(request, login_user, group_id)
 
 
 @router.post('/set_user_group',

diff --git a/src/frontend/index.html b/src/frontend/index.html
@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="icon" href="/favicon.ico" />
-    <script src="/node_modules/ace-builds/src-min-noconflict/ace.js" type="text/javascript"></script>
+    <%- aceScriptSrc %>
     <title>BISHENG</title>
 </head>