Merge branch 'main' of http://113.45.67.59:3003/linfeng/staff_data

apps/server/src/upload/share-code.service.ts

@@ -96,10 +96,10 @@ export class ShareCodeService {
       }
 
       // 标记分享码为已使用
-      await db.shareCode.update({
+      // await db.shareCode.update({
-        where: { id: shareCode.id },
+      //   where: { id: shareCode.id },
-        data: { isUsed: true },
+      //   data: { isUsed: true },
-      });
+      // });
 
       // 记录使用日志
       this.logger.log(`Share code ${code} used for file ${shareCode.fileId}`);

apps/web/src/routes/index.tsx

@@ -39,50 +39,57 @@ export type CustomRouteObject =
 	| CustomIndexRouteObject
 	| CustomNonIndexRouteObject;
 export const routes: CustomRouteObject[] = [
-	{
+	// {
-		path: "/",
+	// 	path: "/",
-		errorElement: <ErrorPage />,
+	// 	errorElement: <ErrorPage />,
-		handle: {
+	// 	handle: {
-			crumb() {
+	// 		crumb() {
-				return <Link to={"/"}>主页</Link>;
+	// 			return <Link to={"/"}>主页</Link>;
-			},
+	// 		},
-		},
+	// 	},
-		children: [
+	// 	children: [
-			{
+	// 		{
-				element: <MainLayout></MainLayout>,
+	// 			element: <MainLayout></MainLayout>,
-				children: [
+	// 			children: [
+	// 				{
+	// 					index: true,
+	// 					element:<Dashboard></Dashboard>,
+	// 				},
+	// 				{
+	// 					path: "/staffinformation",
+	// 					element: <StaffInformation></StaffInformation>,
+	// 				},
+	// 				{
+	// 					path: "/staff",
+	// 					element: <StaffMessage></StaffMessage>,
+	// 				},
+	// 				{
+	// 					path: "/systemlog",
+	// 					element: <SystemLogPage></SystemLogPage>,
+	// 				},
+	// 				{
+	// 					path: "/admin",
+	// 					element: <AdminLayout></AdminLayout>,
+	// 					children:adminRoute.children
+	// 				},
+					
+
+	// 			],
+	// 		},
+			
+	// 	],
+	// },
+	// {
+	// 	path: "/login",
+	// 	breadcrumb: "登录",
+	// 	element: <LoginPage></LoginPage>,
+	// },
 	{
 		index: true,
-						element:<Dashboard></Dashboard>,
+		path: "/",
-					},
+		element:<DeptSettingPage></DeptSettingPage>,
-					{
+		errorElement: <ErrorPage />,
-						path: "/staffinformation",
+	}
-						element: <StaffInformation></StaffInformation>,
-					},
-					{
-						path: "/staff",
-						element: <StaffMessage></StaffMessage>,
-					},
-					{
-						path: "/systemlog",
-						element: <SystemLogPage></SystemLogPage>,
-					},
-					{
-						path: "/admin",
-						element: <AdminLayout></AdminLayout>,
-						children:adminRoute.children
-					},
-
-				],
-			},
-			
-		],
-	},
-	{
-		path: "/login",
-		breadcrumb: "登录",
-		element: <LoginPage></LoginPage>,
-	},
 ];
 
 export const router = createBrowserRouter(routes);

packages/common/src/models/select.ts

@@ -154,8 +154,6 @@ export const trainSituationDetailSelect: Prisma.TrainSituationSelect = {
 					name: true,
 				},
 			},
-			age: true,
-			sex: true,
 			absent: true,
 		},
 	},
@@ -173,8 +171,6 @@ export const staffDetailSelect: Prisma.StaffSelect = {
 	username: true,
 	deptId: true,
 	avatar: true,
-	age: true,
-	sex: true,
 	absent: true,
 	trainSituations:{
 		select:{