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/MarrySelfServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java
index 5a255a0..ad7dc4d 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java
@@ -76,25 +76,27 @@
}
@Override
- public AjaxResult updateData(MarryInfoDto marryInfoDto) {
+ public Boolean updateData(MarryInfoDto marryInfoDto) {
- SysUser user = SecurityUtils.getLoginUser().getUser();
- Long userId = user.getUserId();
+// SysUser user = SecurityUtils.getLoginUser().getUser();
+// Long userId = user.getUserId();
MarrySelf marrySelf = new MarrySelf();
BeanUtils.copyProperties(marryInfoDto,marrySelf);
- marrySelf.setUid(userId);
+ marrySelf.setUid(marryInfoDto.getUid());
//鍏堟煡璇㈡暟鎹簱涓湁娌℃湁鏈敤鎴风殑鏁版嵁
LambdaQueryWrapper<MarrySelf> lqw = new LambdaQueryWrapper<>();
- lqw.eq(MarrySelf::getUid,userId);
+ lqw.eq(MarrySelf::getUid,marryInfoDto.getUid());
List<MarrySelf> list = list(lqw);
+
if(list.isEmpty()){
//濡傛灉鏄┖鐨勶紝閭ｅ氨鏄柊澧�
save(marrySelf);
}else {
+
//鍚﹀垯灏辨槸淇敼
marrySelf.setId(list.get(0).getId());
updateById(marrySelf);
@@ -103,6 +105,6 @@
- return AjaxResult.success();
+ return true;
}
}
--
Gitblit v1.9.1