From b7482c9b5a01258763fa88b292456819ca0a83c9 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期一, 04 十一月 2024 23:54:57 +0800
Subject: [PATCH] 剩下的备忘录一起删除
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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..36f9b01 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
@@ -12,6 +12,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 +24,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 +53,7 @@
@Resource
private ZInfoUserService zInfoUserService;
+
@Resource
private ZfFamilyService zfFamilyService;
@@ -118,12 +121,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));
}
//
@@ -365,6 +381,14 @@
return zInfoUserService.getInfoByfid(fid);
}
+ /**
+ // * 鍒嗕韩缁欏叾浠栧鏃忔暟鎹紝閫氳繃杈撳叆鍚嶅瓧鏌ユ壘鎵�鏈夌殑鍚屽悕鐢ㄦ埛鍜屽鏃忓彿
+ // */
+ @PostMapping("/byName")
+ public AjaxResult listByNickNameDate(@RequestBody ZInfoUser zInfoUser)
+ {
+ return zInfoUserService.findInfoUserNameAClan(zInfoUser.getNickName());
+ }
}
--
Gitblit v1.9.1