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'
---
zhang-content/src/main/java/com/ruoyi/service/impl/MarryUserServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MarryUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MarryUserServiceImpl.java
index a20342c..5ba488f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/MarryUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MarryUserServiceImpl.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.domain.MarrySelf;
import com.ruoyi.domain.MarryUser;
import com.ruoyi.mapper.MarryUserMapper;
import com.ruoyi.service.MarryUserService;
@@ -44,11 +45,19 @@
@Override
public AjaxResult updateData(MarryUser marryUser) {
- SysUser user = SecurityUtils.getLoginUser().getUser();
- Long userId = user.getUserId();
+// SysUser user = SecurityUtils.getLoginUser().getUser();
+// Long userId = user.getUserId();
+//
+// marryUser.setUid(userId);
- marryUser.setUid(userId);
- updateById(marryUser);
+ LambdaQueryWrapper<MarryUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(MarryUser::getUid,marryUser.getUid());
+ List<MarryUser> list = list(lqw);
+ if(list.size()>0) {
+ marryUser.setId(list.get(0).getId());
+ updateById(marryUser);
+ }else save(marryUser);
+
return AjaxResult.success();
--
Gitblit v1.9.1