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 [] = [ type: 'relation', action: ['play', 'remove', 'disable', 'enable'], entity: 'user', - relationFilter: (userId) => { + relationFilter: () => { // 只有root才能进行操作 throw new OakUserUnpermittedException(); }, @@ -63,6 +63,29 @@ const checkers: Checker [] = [ } }, 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[] = [ return 1; } } as UpdateTrigger, - { - 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 ]; export default triggers;