From f61c7769ff00a549cfc15f25a3961900ebc4b1a5 Mon Sep 17 00:00:00 2001
From: "Xc@centOs" <chinawraith@163.com>
Date: Fri, 9 Dec 2022 14:44:55 +0800
Subject: [PATCH] =?UTF-8?q?user=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=94=B9=E5=88=B0checker=E9=87=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/checkers/user.ts | 25 ++++++++++++++++++++++-
 src/index.ts         |  3 +++
 src/triggers/user.ts | 48 --------------------------------------------
 3 files changed, 27 insertions(+), 49 deletions(-)

diff --git a/src/checkers/user.ts b/src/checkers/user.ts
index 38b8777d8..955fd852c 100644
--- a/src/checkers/user.ts
+++ b/src/checkers/user.ts
@@ -16,7 +16,7 @@ const checkers: Checker<EntityDict, 'user', RuntimeCxt> [] = [
         type: 'relation',
         action: ['play', 'remove', 'disable', 'enable'],
         entity: 'user',
-        relationFilter: (userId) => {
+        relationFilter: () => {
             // 只有root才能进行操作
             throw new OakUserUnpermittedException();
         },
@@ -63,6 +63,29 @@ const checkers: Checker<EntityDict, 'user', RuntimeCxt> [] = [
             }
         },
         errMsg: '不能禁用root用户',
+    },
+    {
+        type: 'row',
+        action: 'select',
+        entity: 'user',
+        filter: (operation, context) => {
+            const systemId = context.getSystemId();
+            if (systemId) {
+                return {
+                    id: {
+                        $in: {
+                            entity: 'userSystem',
+                            data: {
+                                userId: 1,
+                            },
+                            filter: {
+                                systemId,
+                            },
+                        },
+                    },
+                };
+            }
+        },
     }
 ];
 
diff --git a/src/index.ts b/src/index.ts
index a4ee37c9d..8d7aecc87 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -16,3 +16,6 @@ export {
 export * from './types/Exception';
 export { composeFileUrl, decomposeFileUrl } from './utils/extraFile';
 export * from './data/DEV-CONFIG';
+export * from './context/BackendRuntimeContext';
+export * from './context/FrontendRuntimeContext';
+export * from './context/RuntimeContext';
diff --git a/src/triggers/user.ts b/src/triggers/user.ts
index 66a8cf5f6..5a7ad38dd 100644
--- a/src/triggers/user.ts
+++ b/src/triggers/user.ts
@@ -124,54 +124,6 @@ const triggers: Trigger<EntityDict, 'user', RuntimeCxt>[] = [
             return 1;
         }
     } as UpdateTrigger<EntityDict, 'user', RuntimeCxt>,
-    {
-        name: '查询用户时，默认加上systemId',
-        entity: 'user',
-        action: 'select',
-        when: 'before',
-        fn: async ({ operation }, context) => {
-            const app = await context.getApplication();
-            if (app) {
-                const { filter } = operation;
-                if (!filter) {
-                    Object.assign(operation, {
-                        filter: {
-                            id: {
-                                $in: {
-                                    entity: 'userSystem',
-                                    data: {
-                                        userId: 1,
-                                    },
-                                    filter: {
-                                        systemId: app.systemId,
-                                    }
-                                }
-                            }
-                        },
-                    });
-                }
-                else {
-                    Object.assign(operation, {
-                        filter: addFilterSegment({
-                            id: {
-                                $in: {
-                                    entity: 'userSystem',
-                                    data: {
-                                        userId: 1,
-                                    },
-                                    filter: {
-                                        systemId: app.systemId,
-                                    }
-                                }
-                            }
-                        }, filter),
-                    });
-                }
-                return 1;
-            }
-            return 0;
-        }
-    } as SelectTriggerBefore<EntityDict, 'user', RuntimeCxt>
 ];
 
 export default triggers;