diff --git a/Web/src/layout/navBars/topBar/user.vue b/Web/src/layout/navBars/topBar/user.vue
index 6a3a78b6..e2c83857 100644
--- a/Web/src/layout/navBars/topBar/user.vue
+++ b/Web/src/layout/navBars/topBar/user.vue
@@ -293,12 +293,13 @@ const changePassword = async () => {
 	if (enabledForceChangePassword) {
 		if (userInfos.value.lastChangePasswordTime == null || userInfos.value.lastChangePasswordTime == undefined) {
 			changePasswordRef.value?.openDialog();
+			return;
 		}
 	}
 
 	// 验证密码有效期
-	var enabledPasswordExpirationTime = themeConfig.value.passwordExpirationTime ?? true;
-	if (enabledPasswordExpirationTime) {
+	var passwordExpirationTime = themeConfig.value.passwordExpirationTime ?? 0;
+	if (passwordExpirationTime > 0) {
 		var res = await getAPI(SysUserApi).apiSysUserVerifyPwdExpirationTimePost();
 		if (!res.data.result) {
 			changePasswordRef.value?.openDialog();
diff --git a/Web/src/types/pinia.d.ts b/Web/src/types/pinia.d.ts
index aeaca08f..fbc4e5a1 100644
--- a/Web/src/types/pinia.d.ts
+++ b/Web/src/types/pinia.d.ts
@@ -101,6 +101,6 @@ declare interface ThemeConfigState {
 		secondVer: boolean; // 是否开启二级验证
 		captcha: boolean; // 是否开启验证码
 		forceChangePassword: boolean; // 是否开启强制修改密码
-		passwordExpirationTime: boolean; // 是否验证密码有效期
+		passwordExpirationTime: number; // 是否验证密码有效期
 	};
 }