Merge pull request 'zouyf_dev' (#78) from zouyf_dev into main

Reviewed-on: #78

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>

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')){