From e37d2ce605787d75fe4fc851c87e7b6c02c9b2d8 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期六, 09 十一月 2024 17:14:51 +0800
Subject: [PATCH] 我的分享和收藏
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index 8015c54..f09797d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.zhang;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mysql.cj.x.protobuf.MysqlxDatatypes;
import com.ruoyi.common.annotation.Log;
@@ -12,6 +13,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ShareMore;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfDoctor;
import com.ruoyi.domain.ZfRelation;
@@ -23,6 +25,7 @@
import com.ruoyi.service.ZfFamilyService;
import com.ruoyi.service.ZfRoleService;
import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -51,6 +54,7 @@
@Resource
private ZInfoUserService zInfoUserService;
+
@Resource
private ZfFamilyService zfFamilyService;
@@ -118,12 +122,25 @@
public AjaxResult getInfo() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- return AjaxResult.success(zInfoUserService.getInfoById(userId));
+
+
+
+ ZInfoUser zInfoUser = zInfoUserService.getInfoById(userId);
+ if(zInfoUser!=null)
+ {
+ return AjaxResult.success(zInfoUser);
+ }
+ else
+ return AjaxResult.success(user);
}
@GetMapping("/{id}")
public AjaxResult getInfoById(@PathVariable("id") Long id) {
// SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = id;
+
+
+ //鏌ヨsys_user琛�
+ // SysUser sysUser = sysUserService.selectUserById(userId);
return AjaxResult.success(zInfoUserService.getInfoById(userId));
}
//
@@ -140,8 +157,12 @@
// }
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- zInfoUser.setUserId(userId);
- return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
+ zInfoUser.setSysId(userId);
+
+ LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
+ uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
+ return toAjax(zInfoUserService.update(uw));
+ // saveOrUpdate(zInfoUser));
}
@@ -365,6 +386,14 @@
return zInfoUserService.getInfoByfid(fid);
}
+ /**
+ * 鍒嗕韩缁欏叾浠栧鏃忔暟鎹紝閫氳繃杈撳叆鍚嶅瓧鏌ユ壘鎵�鏈夌殑鍚屽悕鐢ㄦ埛鍜屽鏃忓彿
+ */
+ @PostMapping("/byName")
+ public AjaxResult listByNickNameDate(@RequestBody ZInfoUser zInfoUser)
+ {
+ return zInfoUserService.findInfoUserNameAClan(zInfoUser.getNickName());
+ }
}
--
Gitblit v1.9.1