修复密码为空

back-ui/src/views/dz/papers/components/paper-knowledge-hand.vue

@@ -39,7 +39,7 @@
             </el-form>
             <el-divider v-if="!hasBuiltPaper" />
             <div v-if="!hasBuiltPaper">
-                <question-intelligent @submit="handleSubmit" />
+            <question-intelligent @submit="handleSubmit" />
             </div>
         </el-col>
     </el-row>
@@ -153,8 +153,8 @@ onConditionReady(async (payload) => {
     
     // 如果不是科目切换，或者是首次加载，则清空知识点
     if (!isSubjectChange) {
-        knowledgeNode.value = null
-        knowledgeCheckNodes.value = []
+    knowledgeNode.value = null
+    knowledgeCheckNodes.value = []
     }
     
     // 保存当前的科目ID

ie-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -414,6 +414,10 @@ public class SysUserController extends BaseController
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user)
     {
+        if (StringUtils.isEmpty(user.getPassword()))
+        {
+            return AjaxResult.error("密码不能为空");
+        }
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
         user.setPassword2(SecurityUtils.encryptPassword2(user.getPassword()));

ie-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.validation.constraints.*;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.enums.ExamType;
 import com.ruoyi.common.enums.UserRegStatus;
 import com.ruoyi.common.utils.dz.SubjectScore;
@@ -68,7 +69,7 @@ public class SysUser extends BaseEntity
     private String avatar;
 
     /** 密码 */
-    @JsonIgnore
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String password;
 
     private String password2;