From edc0b4ee1fb8b292635667379387cc0e76e5af01 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 10 九月 2024 16:21:03 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 17 ++++++++++++++++-
1 files changed, 16 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..344dd46 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
@@ -23,6 +23,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 +52,7 @@
@Resource
private ZInfoUserService zInfoUserService;
+
@Resource
private ZfFamilyService zfFamilyService;
@@ -118,12 +120,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));
}
//
--
Gitblit v1.9.1