From c3620a11ee94991762800fb93dcdcea95f10053a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Thu, 28 Nov 2024 14:17:32 +0800
Subject: [PATCH 1/2] 1

---
 src/renderer/src/components/tinymce/tinymce.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/components/tinymce/tinymce.vue b/src/renderer/src/components/tinymce/tinymce.vue
index 2e4a7e9..f30d52b 100644
--- a/src/renderer/src/components/tinymce/tinymce.vue
+++ b/src/renderer/src/components/tinymce/tinymce.vue
@@ -284,23 +284,23 @@ const init = reactive({
       formData.append("filetype", "image");
       formData.append("suffix", "image");
       formData.append("status", '1');
-      if(userStore.deptId && userStore.deptId != null){
+      if(userStore.deptId != null){
         formData.append("entpid", userStore.deptId);
       }
-      if(userStore.userId && userStore.userId != null){
+      if(userStore.userId != null){
         formData.append("userid", userStore.userId);
       }
-      if(userStore.edudegree && userStore.edudegree != null){
+      if(userStore.edudegree && userStore.edudegree != ''){
         let edudegree = userStore.edudegree.toString();
         if(edudegree != '' && edudegree.indexOf('年级') == -1){
           edudegree += '年级';
         }
         formData.append("edudegree", edudegree);
       }
-      if(userStore.edusubject && userStore.edusubject != null){
+      if(userStore.edusubject && userStore.edusubject != ''){
         formData.append("edusubject", userStore.edusubject);
       }
-      if(userStore.edustage && userStore.edustage != null){
+      if(userStore.edustage && userStore.edustage != ''){
         formData.append("edustage", userStore.edustage);
       }
       if(props.upFileParams?.hasOwnProperty('lessionId')){
-- 
2.44.0.windows.1


From 330a9acddb370b8d2f0d7fb63800dcb3d6fcd374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Mon, 2 Dec 2024 17:25:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=A4=9A=E6=AC=A1?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/components/set-homework/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/src/components/set-homework/index.vue b/src/renderer/src/components/set-homework/index.vue
index b890ff3..8f2db6b 100644
--- a/src/renderer/src/components/set-homework/index.vue
+++ b/src/renderer/src/components/set-homework/index.vue
@@ -41,7 +41,7 @@
     <template #footer>
       <div class="dialog-footer">
         <el-button @click.stop="cloneDialog(ruleFormRef)">取消</el-button>
-        <el-button type="primary" @click.stop="onSubmit(ruleFormRef)"> 确定 </el-button>
+        <el-button :loading="setLoading" type="primary" @click.stop="onSubmit(ruleFormRef)"> 确定 </el-button>
       </div>
     </template>
   </el-dialog>
-- 
2.44.0.windows.1