diff --git a/src/main/java/com/example/demo/controller/AdminController.java b/src/main/java/com/example/demo/controller/AdminController.java
index df0a121..10269c3 100644
--- a/src/main/java/com/example/demo/controller/AdminController.java
+++ b/src/main/java/com/example/demo/controller/AdminController.java
@@ -80,7 +80,7 @@ public class AdminController {
         try {
             return adminService.updatePassword(password);
         } catch (Exception e) {
-            return Result.error("输入不能为空，请检查");
+            return Result.error("服务器波动，请稍作等待");
         }
 
     }
diff --git a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
index aee7cb3..0ff080d 100644
--- a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
@@ -91,6 +91,12 @@ public class AdminServiceImpl implements AdminService {
         String oldPassword = password.getOldPassword();
         String newPassword = password.getNewPassword();
         String againPassword = password.getAgainPassword();
+        if(oldPassword == null || newPassword == null || againPassword == null ||password.getAccount() == null) {
+            return Result.error("输入不能为空");
+        }
+        if (oldPassword.equals(newPassword)) {
+            return Result.error("新密码不能与旧密码相同");
+        }
         // 检查两次输入的新密码是否一致
         if (!newPassword.equals(againPassword)) {
             return Result.error("两次输入的新密码不一致");