From 8d21a2ee4d863a3422a1def79b9f1928c00d22aa Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 22 六月 2025 23:20:27 +0800
Subject: [PATCH] 没生效 重新上传

---
 zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 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 c3e7f70..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
@@ -8,11 +8,14 @@
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.domain.MarrySelf;
 import com.ruoyi.domain.MarryUser;
+import com.ruoyi.domain.ZInfoUser;
 import com.ruoyi.domain.dto.MarryInfoDto;
 import com.ruoyi.domain.dto.MarryUserDto;
 import com.ruoyi.mapper.MarrySelfMapper;
 import com.ruoyi.service.MarrySelfService;
 import com.ruoyi.service.MarryUserService;
+import com.ruoyi.service.ZInfoUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -31,8 +34,12 @@
     @Resource
     MarryUserService marryUserService;
 
+
+
 //    @Resource
 //    MarrySelfService marrySelfService;
+
+
 
     @Override
     public AjaxResult getInfo() {
@@ -46,9 +53,6 @@
         MarrySelf myself = getOne(marrySelfLQW);
 
         if(myself == null){
-            MarrySelf marryInfoDto=new MarrySelf();
-            marryInfoDto.setUid(userId);
-            save(marryInfoDto);
             throw new RuntimeException("璇峰厛缂栬緫淇℃伅");
         }
 
@@ -72,30 +76,35 @@
     }
 
     @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()){
             //濡傛灉鏄┖鐨勶紝閭e氨鏄柊澧�
             save(marrySelf);
 
         }else {
+
             //鍚﹀垯灏辨槸淇敼
             marrySelf.setId(list.get(0).getId());
             updateById(marrySelf);
         }
 
-        return AjaxResult.success();
+
+
+
+        return true;
     }
 }

--
Gitblit v1.9.1