chore: history projectId

packages/libs/lib-server/src/basic/base-controller.ts

@@ -100,5 +100,20 @@ export abstract class BaseController {
     await projectService.checkPermission({userId,projectId,permission})
   }
 
+  /**
+   * 
+   * @param service 检查记录是否属于某用户或某项目
+   * @param id 
+   */
+  async checkEntityOwner(service:any,id:number,permission:string){
+    let { projectId,userId } = await this.getProjectUserId(permission)
+    const authService:any = await this.applicationContext.getAsync("authService");
+    if (projectId) {
+      await authService.checkEntityProjectId(service, id, projectId);
+    }else{
+      await authService.checkEntityUserId(this.ctx, service, id);
+    }
+    return {projectId,userId}
+  }
 
 }

packages/libs/lib-server/src/basic/base-service.ts

@@ -206,18 +206,28 @@ export abstract class BaseService<T> {
     return await qb.getMany();
   }
 
-  async checkUserId(id: any = 0, userId: number, userKey = 'userId') {
-    const res = await this.getRepository().findOne({
+  async checkUserId(ids: number | number[] = 0, userId: number, userKey = 'userId') {
+    if (ids == null) {
+      throw new ValidateException('id不能为空');
+    }
+    if (userId == null) {
+      throw new ValidateException('userId不能为空');
+    }
+    if (!Array.isArray(ids)) {
+      ids = [ids];
+    }
+    const res = await this.getRepository().find({
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
       select: { [userKey]: true },
       where: {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        id,
+        id: In(ids),
+        [userKey]: userId,
       },
     });
-    if (!res || res[userKey] === userId) {
+    if (!res || res.length === ids.length) {
       return;
     }
     throw new PermissionException('权限不足');