diff --git a/src/main/java/com/cool/modules/user/controller/admin/AdminUserInfoController.java b/src/main/java/com/cool/modules/user/controller/admin/AdminUserInfoController.java
index cf2198f..70cbe29 100644
--- a/src/main/java/com/cool/modules/user/controller/admin/AdminUserInfoController.java
+++ b/src/main/java/com/cool/modules/user/controller/admin/AdminUserInfoController.java
@@ -44,8 +44,22 @@ public class AdminUserInfoController extends BaseController<UserInfoService, Use
         Long id = t.getId();
         if (id != null) {
             UserInfoEntity before = userInfoService.getById(id);
-            if (before != null && !ObjUtil.equals(before.getStatus(), t.getStatus())) {
-                coolCache.del("app:userDetails:" + id);
+            if (before != null) {
+                if (!ObjUtil.equals(before.getStatus(), t.getStatus())) {
+                    coolCache.del("app:userDetails:" + id);
+                }
+                if (ObjUtil.isNotEmpty(before.getUsername())) {
+                    t.setUsername(null);
+                }
+                if (ObjUtil.isNotEmpty(before.getUsername()) && ObjUtil.isNotEmpty(before.getEmail())) {
+                    t.setEmail(null);
+                }
+                if (ObjUtil.isNotEmpty(t.getEmail()) && !ObjUtil.equals(t.getEmail(), before.getEmail())) {
+                    userInfoService.checkEmailUnique(t.getEmail(), id);
+                }
+                if (ObjUtil.isNotEmpty(t.getUsername()) && !ObjUtil.equals(t.getUsername(), before.getUsername())) {
+                    userInfoService.checkUsernameUnique(t.getUsername(), id);
+                }
             }
         }
         return super.update(t, requestParams);
diff --git a/src/main/java/com/cool/modules/user/service/UserInfoService.java b/src/main/java/com/cool/modules/user/service/UserInfoService.java
index d925d8a..0efb133 100644
--- a/src/main/java/com/cool/modules/user/service/UserInfoService.java
+++ b/src/main/java/com/cool/modules/user/service/UserInfoService.java
@@ -47,4 +47,8 @@ public interface UserInfoService extends BaseService<UserInfoEntity> {
     void checkLogoffBeforeDelete(Long userId);
 
     String resetPassword(Long userId);
+
+    void checkEmailUnique(String email, Long excludeId);
+
+    void checkUsernameUnique(String username, Long excludeId);
 }
diff --git a/src/main/java/com/cool/modules/user/service/impl/UserInfoServiceImpl.java b/src/main/java/com/cool/modules/user/service/impl/UserInfoServiceImpl.java
index 4e39f42..c14901e 100644
--- a/src/main/java/com/cool/modules/user/service/impl/UserInfoServiceImpl.java
+++ b/src/main/java/com/cool/modules/user/service/impl/UserInfoServiceImpl.java
@@ -112,4 +112,20 @@ public class UserInfoServiceImpl extends BaseServiceImpl<UserInfoMapper, UserInf
         info.updateById();
         return newPassword;
     }
+
+    @Override
+    public void checkEmailUnique(String email, Long excludeId) {
+        UserInfoEntity existing = getOne(QueryWrapper.create()
+            .eq(UserInfoEntity::getEmail, email)
+            .ne(UserInfoEntity::getId, excludeId));
+        CoolPreconditions.check(ObjUtil.isNotEmpty(existing), "该邮箱已被其他用户使用");
+    }
+
+    @Override
+    public void checkUsernameUnique(String username, Long excludeId) {
+        UserInfoEntity existing = getOne(QueryWrapper.create()
+            .eq(UserInfoEntity::getUsername, username)
+            .ne(UserInfoEntity::getId, excludeId));
+        CoolPreconditions.check(ObjUtil.isNotEmpty(existing), "该用户名已被其他用户使用");
+    }
 }