From 1c080304e4f76aa987aa102a83559d78fc31b5b6 Mon Sep 17 00:00:00 2001
From: Rao <1227431568@qq.com>
Date: Wed, 5 Mar 2025 16:50:47 +0800
Subject: [PATCH 1/9] rht

---
 .../components/common/editor/MindEditor.tsx   | 21 ++++++++++++++-----
 .../course/detail/CourseDetailDisplayArea.tsx |  2 +-
 .../models/post/PostSelect/PostSelect.tsx     |  1 +
 .../video-player/VideoDisplay.tsx             |  9 +++++++-
 apps/web/src/routes/index.tsx                 |  4 +---
 config/nginx/conf.d/web.conf                  |  4 ++--
 config/nginx/entrypoint.sh                    |  2 +-
 7 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/apps/web/src/components/common/editor/MindEditor.tsx b/apps/web/src/components/common/editor/MindEditor.tsx
index e9a20b2..13d7cb1 100755
--- a/apps/web/src/components/common/editor/MindEditor.tsx
+++ b/apps/web/src/components/common/editor/MindEditor.tsx
@@ -20,9 +20,11 @@ import { useTusUpload } from "@web/src/hooks/useTusUpload";
 import { useNavigate } from "react-router-dom";
 import { useAuth } from "@web/src/providers/auth-provider";
 import { MIND_OPTIONS } from "./constant";
-import { SaveOutlined } from "@ant-design/icons";
+import { GlobalOutlined, SaveOutlined } from "@ant-design/icons";
 import JoinButton from "../../models/course/detail/CourseOperationBtns/JoinButton";
 import { CourseDetailContext } from "../../models/course/detail/PostDetailContext";
+import ReactDOM from "react-dom";
+import { createRoot } from "react-dom/client";
 export default function MindEditor({ id }: { id?: string }) {
 	const containerRef = useRef<HTMLDivElement>(null);
 	const {
@@ -57,6 +59,17 @@ export default function MindEditor({ id }: { id?: string }) {
 	});
 	const { handleFileUpload } = useTusUpload();
 	const [form] = Form.useForm();
+	const CustomLinkIconPlugin = (mind) => {
+		mind.bus.addListener('operation', async () => {
+			const hyperLinkElement = await document.querySelectorAll('.hyper-link');
+			console.log('hyperLinkElement', hyperLinkElement);
+			hyperLinkElement.forEach((item) => {
+				const hyperLinkDom = createRoot(item)
+				hyperLinkDom.render(<GlobalOutlined></GlobalOutlined>)
+			});
+			
+		});
+	};
 	useEffect(() => {
 		if (post?.id && id) {
 			read.mutateAsync({
@@ -98,6 +111,7 @@ export default function MindEditor({ id }: { id?: string }) {
 			nodeMenu: canEdit, // 禁用节点右键菜单
 			keypress: canEdit, // 禁用键盘快捷键
 		});
+		mind.install(CustomLinkIconPlugin);
 		mind.init(MindElixir.new("新思维导图"));
 		containerRef.current.hidden = true;
 		//挂载实例
@@ -173,16 +187,13 @@ export default function MindEditor({ id }: { id?: string }) {
 				}
 				console.log(result);
 			},
-			(error) => {},
+			(error) => { },
 			`mind-thumb-${new Date().toString()}`
 		);
 	};
 	useEffect(() => {
 		containerRef.current.style.height = `${Math.floor(window.innerHeight - 271)}px`;
 	}, []);
-	useEffect(()=>{
-		console.log(canEdit,user?.id,post?.author?.id)
-	})
 	return (
 		<div className={` flex-col  flex `}>
 			{taxonomies && (
diff --git a/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx b/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx
index f95c29d..d24f7e6 100755
--- a/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx
+++ b/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx
@@ -40,7 +40,7 @@ export const CourseDetailDisplayArea: React.FC = () => {
 								opacity: videoOpacity,
 							}}
 							className="w-full bg-black rounded-lg  ">
-							<div className=" w-full  ">
+							<div className=" w-full cursor-pointer">
 								<VideoPlayer src={lecture?.meta?.videoUrl} />
 							</div>
 						</motion.div>
diff --git a/apps/web/src/components/models/post/PostSelect/PostSelect.tsx b/apps/web/src/components/models/post/PostSelect/PostSelect.tsx
index 63f4058..f97d148 100644
--- a/apps/web/src/components/models/post/PostSelect/PostSelect.tsx
+++ b/apps/web/src/components/models/post/PostSelect/PostSelect.tsx
@@ -91,6 +91,7 @@ export default function PostSelect({
 				dropdownStyle={{
 					minWidth: 200, // 设置合适的最小宽度
 				}}
+				autoClearSearchValue
 				placeholder={placeholder}
 				onChange={onChange}
 				filterOption={false}
diff --git a/apps/web/src/components/presentation/video-player/VideoDisplay.tsx b/apps/web/src/components/presentation/video-player/VideoDisplay.tsx
index 32b1109..976495b 100755
--- a/apps/web/src/components/presentation/video-player/VideoDisplay.tsx
+++ b/apps/web/src/components/presentation/video-player/VideoDisplay.tsx
@@ -191,8 +191,15 @@ export const VideoDisplay: React.FC<VideoDisplayProps> = ({
 		};
 	}, [src, onError, autoPlay]);
 
+	const handleVideoClick = () => {
+		if (videoRef.current) {
+		  videoRef.current.pause();
+		  setIsPlaying(false);
+		}
+	};
+
 	return (
-		<div className="relative w-full aspect-video">
+		<div className="relative w-full aspect-video" onClick={handleVideoClick}>
 			<video
 				ref={videoRef}
 				className="w-full h-full"
diff --git a/apps/web/src/routes/index.tsx b/apps/web/src/routes/index.tsx
index c176a2c..97552d0 100755
--- a/apps/web/src/routes/index.tsx
+++ b/apps/web/src/routes/index.tsx
@@ -72,9 +72,7 @@ export const routes: CustomRouteObject[] = [
 							{
 								path: "editor/:id?",
 								element: (
-									<WithAuth>
-										<PathEditorPage></PathEditorPage>
-									</WithAuth>
+									<PathEditorPage></PathEditorPage>
 								),
 							},
 						],
diff --git a/config/nginx/conf.d/web.conf b/config/nginx/conf.d/web.conf
index 2dd9d9e..2c6260a 100755
--- a/config/nginx/conf.d/web.conf
+++ b/config/nginx/conf.d/web.conf
@@ -2,7 +2,7 @@ server {
     # 监听80端口
     listen 80;
     # 服务器域名/IP地址，使用环境变量
-    server_name 192.168.252.77;
+    server_name host.docker.internal;
 
     # 基础性能优化配置
     # 启用tcp_nopush以优化数据发送
@@ -100,7 +100,7 @@ server {
         # 仅供内部使用
         internal;
         # 代理到认证服务
-        proxy_pass http://192.168.252.77:3000/auth/file;
+        proxy_pass http://host.docker.internal:3001/auth/file;
         
         # 请求优化：不传递请求体
         proxy_pass_request_body off;
diff --git a/config/nginx/entrypoint.sh b/config/nginx/entrypoint.sh
index 7a546eb..136c830 100755
--- a/config/nginx/entrypoint.sh
+++ b/config/nginx/entrypoint.sh
@@ -15,7 +15,7 @@ done
 if [ -f "/usr/share/nginx/html/index.html" ]; then
     # Use envsubst to replace environment variable placeholders
     echo "Processing /usr/share/nginx/html/index.html"
-    envsubst < /usr/share/nginx/html/index.template > /usr/share/nginx/html/index.html.tmp
+    envsubst < /usr/share/nginx/html/index.temp > /usr/share/nginx/html/index.html.tmp
     mv /usr/share/nginx/html/index.html.tmp /usr/share/nginx/html/index.html
     echo "Processed content:"
     cat /usr/share/nginx/html/index.html

From 888ea28168a4e8d6016e29dbffbde395ee462345 Mon Sep 17 00:00:00 2001
From: Rao <1227431568@qq.com>
Date: Wed, 5 Mar 2025 16:59:07 +0800
Subject: [PATCH 2/9] rht

---
 .../models/course/detail/CourseDetailDisplayArea.tsx         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx b/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx
index d24f7e6..9b3c0e2 100755
--- a/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx
+++ b/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx
@@ -1,6 +1,6 @@
 // components/CourseDetailDisplayArea.tsx
 import { motion, useScroll, useTransform } from "framer-motion";
-import React, { useContext, useRef, useState } from "react";
+import React, { useContext, useEffect, useRef, useState } from "react";
 import { VideoPlayer } from "@web/src/components/presentation/video-player/VideoPlayer";
 import { CourseDetailDescription } from "./CourseDetailDescription";
 import { Course, LectureType, PostType } from "@nice/common";
@@ -24,6 +24,9 @@ export const CourseDetailDisplayArea: React.FC = () => {
 	const navigate = useNavigate();
 	const { scrollY } = useScroll();
 	const videoOpacity = useTransform(scrollY, [0, 200], [1, 0.8]);
+	useEffect(()=>{
+		console.log(lecture?.meta?.videoUrl)
+	})
 	return (
 		<div className="min-h-screen bg-gray-50">
 			{/* 固定的视频区域 */}

From c4671ffdfebb0bd040ecfe41df4b6bad8fafc251 Mon Sep 17 00:00:00 2001
From: Rao <1227431568@qq.com>
Date: Wed, 5 Mar 2025 17:30:25 +0800
Subject: [PATCH 3/9] rht

---
 .../presentation/video-player/VideoDisplay.tsx           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/components/presentation/video-player/VideoDisplay.tsx b/apps/web/src/components/presentation/video-player/VideoDisplay.tsx
index 976495b..7260304 100755
--- a/apps/web/src/components/presentation/video-player/VideoDisplay.tsx
+++ b/apps/web/src/components/presentation/video-player/VideoDisplay.tsx
@@ -25,6 +25,7 @@ export const VideoDisplay: React.FC<VideoDisplayProps> = ({
 		isDragging,
 		setIsDragging,
 		progressRef,
+		isPlaying
 	} = useContext(VideoPlayerContext);
 
 	// 处理进度条拖拽
@@ -192,15 +193,19 @@ export const VideoDisplay: React.FC<VideoDisplayProps> = ({
 	}, [src, onError, autoPlay]);
 
 	const handleVideoClick = () => {
-		if (videoRef.current) {
+		if (videoRef.current && isPlaying) {
 		  videoRef.current.pause();
 		  setIsPlaying(false);
+		}else if (videoRef.current && !isPlaying) {
+		  videoRef.current.play();
+		  setIsPlaying(true);
 		}
 	};
 
 	return (
-		<div className="relative w-full aspect-video" onClick={handleVideoClick}>
+		<div className="relative w-full aspect-video" >
 			<video
+				onClick={handleVideoClick}
 				ref={videoRef}
 				className="w-full h-full"
 				poster={poster}

From ba343dbadfa96091525f6c72719e9189ee5a3341 Mon Sep 17 00:00:00 2001
From: Rao <1227431568@qq.com>
Date: Wed, 5 Mar 2025 21:01:57 +0800
Subject: [PATCH 4/9] rht

---
 apps/server/src/queue/models/post/utils.ts       | 16 ++++++++--------
 .../course/detail/CourseDetailDisplayArea.tsx    |  3 ---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/apps/server/src/queue/models/post/utils.ts b/apps/server/src/queue/models/post/utils.ts
index 7e3c3f1..932d4b3 100755
--- a/apps/server/src/queue/models/post/utils.ts
+++ b/apps/server/src/queue/models/post/utils.ts
@@ -107,10 +107,10 @@ export async function updatePostViewCount(id: string, type: VisitType) {
       where: { id: course.id },
       data: {
         [metaFieldMap[type]]: courseViews._sum.views || 0,
-        meta: {
-          ...((post?.meta as any) || {}),
-          [metaFieldMap[type]]: courseViews._sum.views || 0,
-        },
+        // meta: {
+        //   ...((post?.meta as any) || {}),
+        //   [metaFieldMap[type]]: courseViews._sum.views || 0,
+        // },
       },
     });
   }
@@ -127,10 +127,10 @@ export async function updatePostViewCount(id: string, type: VisitType) {
     where: { id },
     data: {
       [metaFieldMap[type]]: totalViews._sum.views || 0,
-      meta: {
-        ...((post?.meta as any) || {}),
-        [metaFieldMap[type]]: totalViews._sum.views || 0,
-      },
+      // meta: {
+      //   ...((post?.meta as any) || {}),
+      //   [metaFieldMap[type]]: totalViews._sum.views || 0,
+      // },
     },
   });
 }
diff --git a/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx b/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx
index 9b3c0e2..6231436 100755
--- a/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx
+++ b/apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx
@@ -24,9 +24,6 @@ export const CourseDetailDisplayArea: React.FC = () => {
 	const navigate = useNavigate();
 	const { scrollY } = useScroll();
 	const videoOpacity = useTransform(scrollY, [0, 200], [1, 0.8]);
-	useEffect(()=>{
-		console.log(lecture?.meta?.videoUrl)
-	})
 	return (
 		<div className="min-h-screen bg-gray-50">
 			{/* 固定的视频区域 */}

From 4c0b50511ad2ff0fcf762412a8de005080d7303e Mon Sep 17 00:00:00 2001
From: Rao <1227431568@qq.com>
Date: Wed, 5 Mar 2025 21:12:45 +0800
Subject: [PATCH 5/9] rht

---
 apps/web/src/components/common/editor/MindEditor.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/components/common/editor/MindEditor.tsx b/apps/web/src/components/common/editor/MindEditor.tsx
index 13d7cb1..9518d4f 100755
--- a/apps/web/src/components/common/editor/MindEditor.tsx
+++ b/apps/web/src/components/common/editor/MindEditor.tsx
@@ -20,7 +20,7 @@ import { useTusUpload } from "@web/src/hooks/useTusUpload";
 import { useNavigate } from "react-router-dom";
 import { useAuth } from "@web/src/providers/auth-provider";
 import { MIND_OPTIONS } from "./constant";
-import { GlobalOutlined, SaveOutlined } from "@ant-design/icons";
+import { LinkOutlined, SaveOutlined } from "@ant-design/icons";
 import JoinButton from "../../models/course/detail/CourseOperationBtns/JoinButton";
 import { CourseDetailContext } from "../../models/course/detail/PostDetailContext";
 import ReactDOM from "react-dom";
@@ -65,7 +65,7 @@ export default function MindEditor({ id }: { id?: string }) {
 			console.log('hyperLinkElement', hyperLinkElement);
 			hyperLinkElement.forEach((item) => {
 				const hyperLinkDom = createRoot(item)
-				hyperLinkDom.render(<GlobalOutlined></GlobalOutlined>)
+				hyperLinkDom.render(<LinkOutlined />)
 			});
 			
 		});

From eafd308db2e814c05a59f7359053aac11cb3218e Mon Sep 17 00:00:00 2001
From: ditiqi <ditiqi@163.com>
Date: Wed, 5 Mar 2025 21:21:03 +0800
Subject: [PATCH 6/9] add

---
 .../models/department/department.router.ts    |  40 +--
 apps/server/src/models/staff/staff.router.ts  |  12 +
 .../src/models/staff/staff.row.service.ts     | 233 +++++++++---------
 apps/server/src/models/staff/staff.service.ts |  44 ++--
 .../models/course/list/PostList.tsx           |   1 +
 5 files changed, 180 insertions(+), 150 deletions(-)

diff --git a/apps/server/src/models/department/department.router.ts b/apps/server/src/models/department/department.router.ts
index 2cd168c..edec18e 100755
--- a/apps/server/src/models/department/department.router.ts
+++ b/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 DepartmentUpdateArgsSchema: ZodType<Prisma.DepartmentUpdateArgs> = z.any()
-const DepartmentFindFirstArgsSchema: ZodType<Prisma.DepartmentFindFirstArgs> = z.any()
-const DepartmentFindManyArgsSchema: ZodType<Prisma.DepartmentFindManyArgs> = z.any()
+const DepartmentCreateArgsSchema: ZodType<Prisma.DepartmentCreateArgs> =
+  z.any();
+const DepartmentUpdateArgsSchema: ZodType<Prisma.DepartmentUpdateArgs> =
+  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,9 +44,11 @@ export class DepartmentRouter {
         return this.departmentService.softDeleteByIds(input.ids);
       }),
     // 更新部门顺序
-    updateOrder: this.trpc.protectProcedure.input(UpdateOrderSchema).mutation(async ({ input }) => {
-      return this.departmentService.updateOrder(input)
-    }),
+    updateOrder: this.trpc.protectProcedure
+      .input(UpdateOrderSchema)
+      .mutation(async ({ input }) => {
+        return this.departmentService.updateOrder(input);
+      }),
     // 查询多个部门
     findMany: this.trpc.procedure
       .input(DepartmentFindManyArgsSchema) // 假设 StaffMethodSchema.findMany 是根据关键字查找员工的 Zod schema
@@ -53,13 +63,15 @@ export class DepartmentRouter {
       }),
     // 获取子部门的简单树结构
     getChildSimpleTree: this.trpc.procedure
-      .input(DepartmentMethodSchema.getSimpleTree).query(async ({ input }) => {
-        return await this.departmentService.getChildSimpleTree(input)
+      .input(DepartmentMethodSchema.getSimpleTree)
+      .query(async ({ input }) => {
+        return await this.departmentService.getChildSimpleTree(input);
       }),
     // 获取父部门的简单树结构
     getParentSimpleTree: this.trpc.procedure
-      .input(DepartmentMethodSchema.getSimpleTree).query(async ({ input }) => {
-        return await this.departmentService.getParentSimpleTree(input)
+      .input(DepartmentMethodSchema.getSimpleTree)
+      .query(async ({ input }) => {
+        return await this.departmentService.getParentSimpleTree(input);
       }),
     // 获取部门行数据
     getRows: this.trpc.protectProcedure
diff --git a/apps/server/src/models/staff/staff.router.ts b/apps/server/src/models/staff/staff.router.ts
index 4768b16..9f227a4 100755
--- a/apps/server/src/models/staff/staff.router.ts
+++ b/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 }) => {
diff --git a/apps/server/src/models/staff/staff.row.service.ts b/apps/server/src/models/staff/staff.row.service.ts
index c2e92c2..7347725 100755
--- a/apps/server/src/models/staff/staff.row.service.ts
+++ b/apps/server/src/models/staff/staff.row.service.ts
@@ -1,13 +1,13 @@
 import { Injectable } from '@nestjs/common';
 import {
-    db,
-    ObjectType,
-    StaffMethodSchema,
-    UserProfile,
-    RolePerms,
-    ResPerm,
-    Staff,
-    RowModelRequest,
+  db,
+  ObjectType,
+  StaffMethodSchema,
+  UserProfile,
+  RolePerms,
+  ResPerm,
+  Staff,
+  RowModelRequest,
 } from '@nice/common';
 import { DepartmentService } from '../department/department.service';
 import { RowCacheService } from '../base/row-cache.service';
@@ -15,121 +15,116 @@ import { z } from 'zod';
 import { isFieldCondition } from '../base/sql-builder';
 @Injectable()
 export class StaffRowService extends RowCacheService {
-    constructor(
-        private readonly departmentService: DepartmentService,
-    ) {
-        super(ObjectType.STAFF, false);
+  constructor(private readonly departmentService: DepartmentService) {
+    super(ObjectType.STAFF, false);
+  }
+  createUnGroupingRowSelect(request?: RowModelRequest): string[] {
+    const result = super
+      .createUnGroupingRowSelect(request)
+      .concat([
+        `${this.tableName}.id AS id`,
+        `${this.tableName}.username AS username`,
+        `${this.tableName}.showname AS showname`,
+        `${this.tableName}.avatar AS avatar`,
+        `${this.tableName}.officer_id AS officer_id`,
+        `${this.tableName}.phone_number AS phone_number`,
+        `${this.tableName}.order AS order`,
+        `${this.tableName}.enabled AS enabled`,
+        'dept.name AS dept_name',
+        'domain.name AS domain_name',
+      ]);
+    return result;
+  }
+  createJoinSql(request?: RowModelRequest): string[] {
+    return [
+      `LEFT JOIN department dept ON ${this.tableName}.dept_id = dept.id`,
+      `LEFT JOIN department domain ON ${this.tableName}.domain_id = domain.id`,
+    ];
+  }
+  protected createGetRowsFilters(
+    request: z.infer<typeof StaffMethodSchema.getRows>,
+    staff: UserProfile,
+  ) {
+    const condition = super.createGetRowsFilters(request);
+    const { domainId, includeDeleted = false } = request;
+    if (isFieldCondition(condition)) {
+      return;
     }
-    createUnGroupingRowSelect(request?: RowModelRequest): string[] {
-        const result = super.createUnGroupingRowSelect(request).concat([
-            `${this.tableName}.id AS id`,
-            `${this.tableName}.username AS username`,
-            `${this.tableName}.showname AS showname`,
-            `${this.tableName}.avatar AS avatar`,
-            `${this.tableName}.officer_id AS officer_id`,
-            `${this.tableName}.phone_number AS phone_number`,
-            `${this.tableName}.order AS order`,
-            `${this.tableName}.enabled AS enabled`,
-            'dept.name AS dept_name',
-            'domain.name AS domain_name',
-        ]);
-        return result
+    if (domainId) {
+      condition.AND.push({
+        field: `${this.tableName}.domain_id`,
+        value: domainId,
+        op: 'equals',
+      });
+    } else {
+      condition.AND.push({
+        field: `${this.tableName}.domain_id`,
+        op: 'blank',
+      });
     }
-    createJoinSql(request?: RowModelRequest): string[] {
-        return [
-            `LEFT JOIN department dept ON ${this.tableName}.dept_id = dept.id`,
-            `LEFT JOIN department domain ON ${this.tableName}.domain_id = domain.id`,
-        ];
+    if (!includeDeleted) {
+      condition.AND.push({
+        field: `${this.tableName}.deleted_at`,
+        type: 'date',
+        op: 'blank',
+      });
     }
-    protected createGetRowsFilters(
-        request: z.infer<typeof StaffMethodSchema.getRows>,
-        staff: UserProfile,
-    ) {
-        const condition = super.createGetRowsFilters(request);
-        const { domainId, includeDeleted = false } = request;
-        if (isFieldCondition(condition)) {
-            return;
-        }
-        if (domainId) {
-            condition.AND.push({
-                field: `${this.tableName}.domain_id`,
-                value: domainId,
-                op: 'equals',
-            });
-        } else {
-            condition.AND.push({
-                field: `${this.tableName}.domain_id`,
-                op: 'blank',
-            });
-        }
-        if (!includeDeleted) {
-            condition.AND.push({
-                field: `${this.tableName}.deleted_at`,
-                type: 'date',
-                op: 'blank',
-            });
-        }
-        condition.OR = [];
-        if (!staff.permissions.includes(RolePerms.MANAGE_ANY_STAFF)) {
-            if (staff.permissions.includes(RolePerms.MANAGE_DOM_STAFF)) {
-                condition.OR.push({
-                    field: 'dept.id',
-                    value: staff.domainId,
-                    op: 'equals',
-                });
-            }
-        }
-
-        return condition;
-    }
-
-    async getPermissionContext(id: string, staff: UserProfile) {
-        const data = await db.staff.findUnique({
-            where: { id },
-            select: {
-                deptId: true,
-                domainId: true,
-            },
+    condition.OR = [];
+    if (!staff.permissions.includes(RolePerms.MANAGE_ANY_STAFF)) {
+      if (staff.permissions.includes(RolePerms.MANAGE_DOM_STAFF)) {
+        condition.OR.push({
+          field: 'dept.id',
+          value: staff.domainId,
+          op: 'equals',
         });
-        const deptId = data?.deptId;
-        const isFromSameDept = staff.deptIds?.includes(deptId);
-        const domainChildDeptIds = await this.departmentService.getDescendantIds(
-            staff.domainId, true
-        );
-        const belongsToDomain = domainChildDeptIds.includes(
-            deptId,
-        );
-        return { isFromSameDept, belongsToDomain };
-    }
-    protected async setResPermissions(
-        data: Staff,
-        staff: UserProfile,
-    ) {
-        const permissions: ResPerm = {};
-        const { isFromSameDept, belongsToDomain } = await this.getPermissionContext(
-            data.id,
-            staff,
-        );
-        const setManagePermissions = (permissions: ResPerm) => {
-            Object.assign(permissions, {
-                read: true,
-                delete: true,
-                edit: true,
-            });
-        };
-        staff.permissions.forEach((permission) => {
-            switch (permission) {
-                case RolePerms.MANAGE_ANY_STAFF:
-                    setManagePermissions(permissions);
-                    break;
-                case RolePerms.MANAGE_DOM_STAFF:
-                    if (belongsToDomain) {
-                        setManagePermissions(permissions);
-                    }
-                    break;
-            }
-        });
-        return { ...data, perm: permissions };
+      }
     }
 
+    return condition;
+  }
+
+  async getPermissionContext(id: string, staff: UserProfile) {
+    const data = await db.staff.findUnique({
+      where: { id },
+      select: {
+        deptId: true,
+        domainId: true,
+      },
+    });
+    const deptId = data?.deptId;
+    const isFromSameDept = staff.deptIds?.includes(deptId);
+    const domainChildDeptIds = await this.departmentService.getDescendantIds(
+      staff.domainId,
+      true,
+    );
+    const belongsToDomain = domainChildDeptIds.includes(deptId);
+    return { isFromSameDept, belongsToDomain };
+  }
+  protected async setResPermissions(data: Staff, staff: UserProfile) {
+    const permissions: ResPerm = {};
+    const { isFromSameDept, belongsToDomain } = await this.getPermissionContext(
+      data.id,
+      staff,
+    );
+    const setManagePermissions = (permissions: ResPerm) => {
+      Object.assign(permissions, {
+        read: true,
+        delete: true,
+        edit: true,
+      });
+    };
+    staff.permissions.forEach((permission) => {
+      switch (permission) {
+        case RolePerms.MANAGE_ANY_STAFF:
+          setManagePermissions(permissions);
+          break;
+        case RolePerms.MANAGE_DOM_STAFF:
+          if (belongsToDomain) {
+            setManagePermissions(permissions);
+          }
+          break;
+      }
+    });
+    return { ...data, perm: permissions };
+  }
 }
diff --git a/apps/server/src/models/staff/staff.service.ts b/apps/server/src/models/staff/staff.service.ts
index cf37549..57cddd2 100755
--- a/apps/server/src/models/staff/staff.service.ts
+++ b/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: 'username', errorMsg: (val: string) => `帐号为${val}的用户已存在` }
+      {
+        field: 'officerId',
+        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,
@@ -87,12 +99,12 @@ export class StaffService extends BaseService<Prisma.StaffDelegate> {
   }
 
   /**
-  * 更新员工DomainId
-  * @param data 包含domainId对象
-  * @returns 更新后的员工记录
-  */
+   * 更新员工DomainId
+   * @param data 包含domainId对象
+   * @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;
   // }
-
 }
diff --git a/apps/web/src/components/models/course/list/PostList.tsx b/apps/web/src/components/models/course/list/PostList.tsx
index ce9da18..a276060 100755
--- a/apps/web/src/components/models/course/list/PostList.tsx
+++ b/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,

From fdb7b2357a6f025bc5d2ec0a8803142015fb2500 Mon Sep 17 00:00:00 2001
From: ditiqi <ditiqi@163.com>
Date: Wed, 5 Mar 2025 21:36:07 +0800
Subject: [PATCH 7/9] add

---
 apps/web/src/components/test/StaffList.tsx | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 apps/web/src/components/test/StaffList.tsx

diff --git a/apps/web/src/components/test/StaffList.tsx b/apps/web/src/components/test/StaffList.tsx
new file mode 100644
index 0000000..b418bdc
--- /dev/null
+++ b/apps/web/src/components/test/StaffList.tsx
@@ -0,0 +1,6 @@
+import { api } from "packages/client/dist";
+import { ReactNode } from "react";
+export default function StaffList({ renderItem }: { renderItem: ReactNode }) {
+	const { data } = api.staff.findManyWithPagination.useQuery({});
+	data.items.map((staff) => renderItem);
+}

From 55f79c8be618657d3f6893ba71f408ddbcc84035 Mon Sep 17 00:00:00 2001
From: linfeng <2819853134@qq.com>
Date: Wed, 5 Mar 2025 21:37:01 +0800
Subject: [PATCH 8/9] 2025.03.03.0950

---
 config/nginx/conf.d/web.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/nginx/conf.d/web.conf b/config/nginx/conf.d/web.conf
index 88fa2c9..67302b8 100755
--- a/config/nginx/conf.d/web.conf
+++ b/config/nginx/conf.d/web.conf
@@ -100,7 +100,7 @@ server {
         # 仅供内部使用
         internal;
         # 代理到认证服务
-        proxy_pass http://host.docker.internal:3006/auth/file;
+        proxy_pass http://host.docker.internal:3000/auth/file;
         
         # 请求优化：不传递请求体
         proxy_pass_request_body off;

From c6b8b8fa06726b8a1c52c1108cb5c5f72e501bab Mon Sep 17 00:00:00 2001
From: linfeng <2819853134@qq.com>
Date: Wed, 5 Mar 2025 21:50:02 +0800
Subject: [PATCH 9/9] sada

---
 apps/web/src/components/test/StaffCard.tsx | 13 +++++++++++++
 config/nginx/conf.d/web.conf               |  4 ----
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 apps/web/src/components/test/StaffCard.tsx

diff --git a/apps/web/src/components/test/StaffCard.tsx b/apps/web/src/components/test/StaffCard.tsx
new file mode 100644
index 0000000..3c67ea6
--- /dev/null
+++ b/apps/web/src/components/test/StaffCard.tsx
@@ -0,0 +1,13 @@
+import { Staff } from "packages/common/dist";
+import { api } from "packages/client/dist";
+export const StaffCard = (staff: Staff) => {
+  const { data } = api.staff.findManyWithPagination.useQuery({
+    page
+  });
+  return(
+    <div className="staff-card">
+      <div className="staff-card__username">${username}</div>
+    </div>
+  )
+    
+}
\ No newline at end of file
diff --git a/config/nginx/conf.d/web.conf b/config/nginx/conf.d/web.conf
index 3b543fa..67302b8 100755
--- a/config/nginx/conf.d/web.conf
+++ b/config/nginx/conf.d/web.conf
@@ -100,11 +100,7 @@ server {
         # 仅供内部使用
         internal;
         # 代理到认证服务
-<<<<<<< HEAD
         proxy_pass http://host.docker.internal:3000/auth/file;
-=======
-        proxy_pass http://host.docker.internal:3001/auth/file;
->>>>>>> fdb7b2357a6f025bc5d2ec0a8803142015fb2500
         
         # 请求优化：不传递请求体
         proxy_pass_request_body off;