From 10097e70a78f69136f7a7c8e103d80c50848890e Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Sat, 12 Oct 2024 16:47:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BC=9A=E8=AE=AE=E5=AE=A4&?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Home/Index/index.tsx | 15 ++++++---------
 src/page/Home/User/index.tsx  | 15 ++++++---------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/page/Home/Index/index.tsx b/src/page/Home/Index/index.tsx
index 38a0415..4a73027 100644
--- a/src/page/Home/Index/index.tsx
+++ b/src/page/Home/Index/index.tsx
@@ -27,12 +27,12 @@ const Index: React.FC = () => {
   })
   const [createRoomModal, setCreateRoomModal] = useState(false)
   const [timeSelectModal, setTimeSelectModal] = useState(false)
-  const [createRoomFrom, setCreateRoomFrom] = useState<{ id: string, roomName: string, roomNum: string, subject: string, year: string }>({
+  const [createRoomFrom, setCreateRoomFrom] = useState<{ id: string, roomName: string, roomNum: string, subject: number, year: string }>({
     id: "",
     roomName: "",
     roomNum: "",
-    subject: "",
-    year: ""
+    subject: 0,
+    year: "0"
   })
   const joinSettingRef = useRef<any>();
   const stupWizardRef = useRef<any>();
@@ -185,8 +185,8 @@ const Index: React.FC = () => {
               setCreateRoomFrom({
                 roomName: "",
                 roomNum: "",
-                subject: "",
-                year: "",
+                subject: 0,
+                year: "0",
                 id: "",
               })
               getSubDpList()
@@ -412,7 +412,7 @@ const Index: React.FC = () => {
               placeholder='请选择学科'
               style={{ width: '100%', marginBottom: '14px' }}
               options={subjectList}
-              value={createRoomFrom.subject === "" ? null : createRoomFrom.subject} onChange={(e) => {
+              value={createRoomFrom.subject} onChange={(e) => {
                 setCreateRoomFrom({
                   ...createRoomFrom,
                   subject: e
@@ -433,9 +433,6 @@ const Index: React.FC = () => {
               if (!createRoomFrom.year) {
                 return message.error('请输入届！')
               }
-              if (createRoomFrom.subject === "") {
-                return message.error('请选择学科！')
-              }
               if (isCreateRoom) {
                 isGetCheckoutRoomNum(createRoomFrom.roomNum, (bool: boolean) => {
                   if (bool) {
diff --git a/src/page/Home/User/index.tsx b/src/page/Home/User/index.tsx
index 1e9e35e..46b6fd2 100644
--- a/src/page/Home/User/index.tsx
+++ b/src/page/Home/User/index.tsx
@@ -31,8 +31,8 @@ const User: React.FC = () => {
     RoleId: null,
     Pwd: "",
     UserName: "",
-    subject: null,
-    year: "",
+    subject: 0,
+    year: '0',
   })
   const [changeUserPawModal, setChangeUserPawModal] = useState(false)
   const [changeImportModal, setChangeImportModal] = useState(false)
@@ -151,8 +151,8 @@ const User: React.FC = () => {
                       RoleId: null,
                       Pwd: "",
                       UserName: "",
-                      subject: null,
-                      year: "",
+                      subject: 0,
+                      year: '0',
                     })
                     setAddUserModal(true)
                   }
@@ -181,8 +181,8 @@ const User: React.FC = () => {
                         RoleId: null,
                         Pwd: "",
                         UserName: "",
-                        subject: null,
-                        year: "",
+                        subject: 0,
+                        year: '0',
                       })
                       setAddUserModal(true)
                     }
@@ -426,9 +426,6 @@ const User: React.FC = () => {
               if (!addUserFrom.year) {
                 return message.error('请输入届！')
               }
-              if (addUserFrom.subject === null) {
-                return message.error('请选择学科！')
-              }
               if (isCreateUser === 'add') {
                 await PostUser({
                   ...addUserFrom,