From 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 23 六月 2025 20:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index d6b2651..2369ba9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -288,7 +288,6 @@
}
// ===== 3. 濠氬Щ鐘舵�佷笓椤瑰鐞� =====
- if(infoUser.getMaritalStatus() != null) {
// 3.1 鏋勫缓鏈汉濠氬Щ淇℃伅
MarryInfoDto marrySelf = new MarryInfoDto();
marrySelf.setUid(user.getSysId()); // 绯荤粺ID
@@ -345,7 +344,7 @@
exSpouseRecord.setMarryStatus(2); // 绂诲鐘舵��
marryUserService.save(exSpouseRecord); // 鍐欏叆鍘嗗彶琛�
}
- }
+
return AjaxResult.success(); // 鎿嶄綔鎴愬姛
} else {
// 鈿狅笍 闈炲搴垚鍛樼洿鎺ラ樆鏂�
--
Gitblit v1.9.1