add

apps/server/src/models/department/department.router.ts

@@ -1,21 +1,29 @@
 import { Injectable } from '@nestjs/common';
 import { TrpcService } from '@server/trpc/trpc.service';
 import { DepartmentService } from './department.service'; // assuming it's in the same directory
-import { DepartmentMethodSchema, Prisma, UpdateOrderSchema } from '@nice/common';
+import {
+  DepartmentMethodSchema,
+  Prisma,
+  UpdateOrderSchema,
+} from '@nice/common';
 import { z, ZodType } from 'zod';
 import { DepartmentRowService } from './department.row.service';
 
-const DepartmentCreateArgsSchema: ZodType<Prisma.DepartmentCreateArgs> = z.any()
+const DepartmentCreateArgsSchema: ZodType<Prisma.DepartmentCreateArgs> =
-const DepartmentUpdateArgsSchema: ZodType<Prisma.DepartmentUpdateArgs> = z.any()
+  z.any();
-const DepartmentFindFirstArgsSchema: ZodType<Prisma.DepartmentFindFirstArgs> = z.any()
+const DepartmentUpdateArgsSchema: ZodType<Prisma.DepartmentUpdateArgs> =
-const DepartmentFindManyArgsSchema: ZodType<Prisma.DepartmentFindManyArgs> = z.any()
+  z.any();
+const DepartmentFindFirstArgsSchema: ZodType<Prisma.DepartmentFindFirstArgs> =
+  z.any();
+const DepartmentFindManyArgsSchema: ZodType<Prisma.DepartmentFindManyArgs> =
+  z.any();
 @Injectable()
 export class DepartmentRouter {
   constructor(
     private readonly trpc: TrpcService,
     private readonly departmentService: DepartmentService, // 注入 DepartmentService
-    private readonly departmentRowService: DepartmentRowService
+    private readonly departmentRowService: DepartmentRowService,
-  ) { }
+  ) {}
   router = this.trpc.router({
     // 创建部门
     create: this.trpc.protectProcedure
@@ -36,8 +44,10 @@ export class DepartmentRouter {
         return this.departmentService.softDeleteByIds(input.ids);
       }),
     // 更新部门顺序
-    updateOrder: this.trpc.protectProcedure.input(UpdateOrderSchema).mutation(async ({ input }) => {
+    updateOrder: this.trpc.protectProcedure
-      return this.departmentService.updateOrder(input)
+      .input(UpdateOrderSchema)
+      .mutation(async ({ input }) => {
+        return this.departmentService.updateOrder(input);
       }),
     // 查询多个部门
     findMany: this.trpc.procedure
@@ -53,13 +63,15 @@ export class DepartmentRouter {
       }),
     // 获取子部门的简单树结构
     getChildSimpleTree: this.trpc.procedure
-      .input(DepartmentMethodSchema.getSimpleTree).query(async ({ input }) => {
+      .input(DepartmentMethodSchema.getSimpleTree)
-        return await this.departmentService.getChildSimpleTree(input)
+      .query(async ({ input }) => {
+        return await this.departmentService.getChildSimpleTree(input);
       }),
     // 获取父部门的简单树结构
     getParentSimpleTree: this.trpc.procedure
-      .input(DepartmentMethodSchema.getSimpleTree).query(async ({ input }) => {
+      .input(DepartmentMethodSchema.getSimpleTree)
-        return await this.departmentService.getParentSimpleTree(input)
+      .query(async ({ input }) => {
+        return await this.departmentService.getParentSimpleTree(input);
       }),
     // 获取部门行数据
     getRows: this.trpc.protectProcedure

apps/server/src/models/staff/staff.router.ts

@@ -61,6 +61,18 @@ export class StaffRouter {
       .query(async ({ input }) => {
         return await this.staffService.findMany(input);
       }),
+    findManyWithPagination: this.trpc.procedure
+      .input(
+        z.object({
+          page: z.number().optional(),
+          pageSize: z.number().optional(),
+          where: StaffWhereInputSchema.optional(),
+          select: StaffSelectSchema.optional(),
+        }),
+      ) // Assuming StaffMethodSchema.findMany is the Zod schema for finding staffs by keyword
+      .query(async ({ input }) => {
+        return await this.staffService.findManyWithPagination(input);
+      }),
     getRows: this.trpc.protectProcedure
       .input(StaffMethodSchema.getRows)
       .query(async ({ input, ctx }) => {

apps/server/src/models/staff/staff.row.service.ts

@@ -15,13 +15,13 @@ import { z } from 'zod';
 import { isFieldCondition } from '../base/sql-builder';
 @Injectable()
 export class StaffRowService extends RowCacheService {
-    constructor(
+  constructor(private readonly departmentService: DepartmentService) {
-        private readonly departmentService: DepartmentService,
-    ) {
     super(ObjectType.STAFF, false);
   }
   createUnGroupingRowSelect(request?: RowModelRequest): string[] {
-        const result = super.createUnGroupingRowSelect(request).concat([
+    const result = super
+      .createUnGroupingRowSelect(request)
+      .concat([
         `${this.tableName}.id AS id`,
         `${this.tableName}.username AS username`,
         `${this.tableName}.showname AS showname`,
@@ -33,7 +33,7 @@ export class StaffRowService extends RowCacheService {
         'dept.name AS dept_name',
         'domain.name AS domain_name',
       ]);
-        return result
+    return result;
   }
   createJoinSql(request?: RowModelRequest): string[] {
     return [
@@ -94,17 +94,13 @@ export class StaffRowService extends RowCacheService {
     const deptId = data?.deptId;
     const isFromSameDept = staff.deptIds?.includes(deptId);
     const domainChildDeptIds = await this.departmentService.getDescendantIds(
-            staff.domainId, true
+      staff.domainId,
-        );
+      true,
-        const belongsToDomain = domainChildDeptIds.includes(
-            deptId,
     );
+    const belongsToDomain = domainChildDeptIds.includes(deptId);
     return { isFromSameDept, belongsToDomain };
   }
-    protected async setResPermissions(
+  protected async setResPermissions(data: Staff, staff: UserProfile) {
-        data: Staff,
-        staff: UserProfile,
-    ) {
     const permissions: ResPerm = {};
     const { isFromSameDept, belongsToDomain } = await this.getPermissionContext(
       data.id,
@@ -131,5 +127,4 @@ export class StaffRowService extends RowCacheService {
     });
     return { ...data, perm: permissions };
   }
-
 }

apps/server/src/models/staff/staff.service.ts

@@ -14,7 +14,6 @@ import EventBus, { CrudOperation } from '@server/utils/event-bus';
 
 @Injectable()
 export class StaffService extends BaseService<Prisma.StaffDelegate> {
-
   constructor(private readonly departmentService: DepartmentService) {
     super(db, ObjectType.STAFF, true);
   }
@@ -25,7 +24,10 @@ export class StaffService extends BaseService<Prisma.StaffDelegate> {
    */
   async findByDept(data: z.infer<typeof StaffMethodSchema.findByDept>) {
     const { deptId, domainId } = data;
-    const childDepts = await this.departmentService.getDescendantIds(deptId, true);
+    const childDepts = await this.departmentService.getDescendantIds(
+      deptId,
+      true,
+    );
     const result = await db.staff.findMany({
       where: {
         deptId: { in: childDepts },
@@ -50,7 +52,9 @@ export class StaffService extends BaseService<Prisma.StaffDelegate> {
     await this.validateUniqueFields(data, where.id);
     const updateData = {
       ...data,
-      ...(data.password && { password: await argon2.hash(data.password as string) })
+      ...(data.password && {
+        password: await argon2.hash(data.password as string),
+      }),
     };
     const result = await super.update({ ...args, data: updateData });
     this.emitDataChangedEvent(result, CrudOperation.UPDATED);
@@ -58,17 +62,26 @@ export class StaffService extends BaseService<Prisma.StaffDelegate> {
   }
   private async validateUniqueFields(data: any, excludeId?: string) {
     const uniqueFields = [
-      { field: 'officerId', errorMsg: (val: string) => `证件号为${val}的用户已存在` },
+      {
-      { field: 'phoneNumber', errorMsg: (val: string) => `手机号为${val}的用户已存在` },
+        field: 'officerId',
-      { field: 'username', errorMsg: (val: string) => `帐号为${val}的用户已存在` }
+        errorMsg: (val: string) => `证件号为${val}的用户已存在`,
+      },
+      {
+        field: 'phoneNumber',
+        errorMsg: (val: string) => `手机号为${val}的用户已存在`,
+      },
+      {
+        field: 'username',
+        errorMsg: (val: string) => `帐号为${val}的用户已存在`,
+      },
     ];
     for (const { field, errorMsg } of uniqueFields) {
       if (data[field]) {
         const count = await db.staff.count({
           where: {
             [field]: data[field],
-            ...(excludeId && { id: { not: excludeId } })
+            ...(excludeId && { id: { not: excludeId } }),
-          }
+          },
         });
         if (count > 0) {
           throw new Error(errorMsg(data[field]));
@@ -77,9 +90,8 @@ export class StaffService extends BaseService<Prisma.StaffDelegate> {
     }
   }
 
-
   private emitDataChangedEvent(data: any, operation: CrudOperation) {
-    EventBus.emit("dataChanged", {
+    EventBus.emit('dataChanged', {
       type: this.objectType,
       operation,
       data,
@@ -92,7 +104,7 @@ export class StaffService extends BaseService<Prisma.StaffDelegate> {
    * @returns 更新后的员工记录
    */
   async updateUserDomain(data: { domainId?: string }, staff?: UserProfile) {
-    let { domainId } = data;
+    const { domainId } = data;
     if (staff.domainId !== domainId) {
       const result = await this.update({
         where: { id: staff.id },
@@ -107,7 +119,6 @@ export class StaffService extends BaseService<Prisma.StaffDelegate> {
     }
   }
 
-
   // /**
   //  * 根据关键词或ID集合查找员工
   //  * @param data 包含关键词、域ID和ID集合的对象
@@ -176,5 +187,4 @@ export class StaffService extends BaseService<Prisma.StaffDelegate> {
 
   //   return combinedResults;
   // }
-
 }

apps/web/src/components/models/course/list/PostList.tsx

@@ -28,6 +28,7 @@ export default function PostList({
 	renderItem,
 }: PostListProps) {
 	const [currentPage, setCurrentPage] = useState<number>(params?.page || 1);
+
 	const { data, isLoading }: PostPagnationProps =
 		api.post.findManyWithPagination.useQuery({
 			select: courseDetailSelect,