Feature 862

.gitignore

@@ -205,3 +205,4 @@ results.sqlite
 tasks/*
 ~/*
 tasks
+docker-entrypoint.sh

api/v1/views/mine.py

@@ -424,6 +424,36 @@ def get_mine_apps_with_group(request, tenant_id: str, app_group_id:str=None, ord
 
     return list(apps) if apps else []
 
+@api.get("/mine/tenant/{tenant_id}/mine_group_apps_all/", response=MineAppListOut, tags=["我的"])
+@operation(MineAppListOut,roles=[NORMAL_USER, TENANT_ADMIN, PLATFORM_ADMIN])
+def get_mine_apps_with_group_all(request, tenant_id: str, app_group_id:str=None, order:str=None):
+    """获取我的分组应用
+    """
+    apps = []
+    if app_group_id in [None,"","0",0]:
+        apps = App.active_objects.filter(
+            Q(tenant=request.tenant) | Q(entry_permission__is_open=True)
+        )
+    else:
+        app_group = AppGroup.active_objects.get(
+            tenant =request.tenant,
+            id=app_group_id
+        )
+        apps = app_group.apps.filter(Q(tenant=request.tenant) | Q(entry_permission__is_open=True))
+    # 需要甄别有入口权限的应用
+    from arkid.core.perm.permission_data import PermissionData
+    pd = PermissionData()
+    app_ids = pd.get_entry_apps(request.user, tenant_id, apps)
+    if app_ids:
+        apps = apps.filter(id__in=app_ids)
+    else:
+        apps = apps.filter(id=None)
+    if order:
+        apps = apps.order_by(order)
+    apps = apps.all()
+
+    return SuccessDict(data=list(apps) if apps else [])
+
 @api.get("/mine/unread_messages/",response=List[MineMessageListItemOut],tags=["我的"],auth=GlobalAuth())
 @operation(MineMessageListOut,roles=[NORMAL_USER, TENANT_ADMIN, PLATFORM_ADMIN])
 @paginate(CustomPagination)