From 717be6a41702dc249906346cacdcb9de1ff00fde Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期四, 20 六月 2024 17:34:49 +0800
Subject: [PATCH] 企业来访添加
---
project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java
index 2101771..7dacc7f 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java
@@ -1,6 +1,8 @@
package com.project.admin.controller.system;
import com.project.common.config.ProjectConfig;
+import com.project.common.core.domain.entity.SysDept;
+import com.project.system.service.ISysDeptService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -35,6 +37,7 @@
public class SysProfileController extends BaseController
{
private final ISysUserService userService;
+ private final ISysDeptService deptService;
private final TokenService tokenService;
@@ -45,6 +48,8 @@
public AjaxResult profile()
{
SysUser user = userService.getById(getUserId());
+ SysDept sysDept = deptService.selectDeptById(user.getDeptId());
+ user.setDept(sysDept);
AjaxResult ajax = AjaxResult.success(user);
ajax.put("roleGroup", userService.selectUserRoleGroup(user.getUserName()));
ajax.put("postGroup", userService.selectUserPostGroup(user.getUserName()));
@@ -59,14 +64,6 @@
public AjaxResult updateProfile(@RequestBody SysUser user)
{
LoginUser loginUser = getLoginUser();
- user.setUserName(user.getUserName());
- SysUser byId = userService.getById(user.getUserId());
- byId.setNickName(user.getNickName());
- byId.setPhonenumber(user.getPhonenumber());
- byId.setEmail(user.getEmail());
- byId.setSex(user.getSex());
- byId.setAvatar(user.getAvatar());
- byId.setDeptId(user.getDeptId());
if (StringUtils.isNotEmpty(user.getPhonenumber())
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
{
@@ -77,11 +74,11 @@
{
return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
- int upd = userService.updateUser(byId);
+ int upd = userService.updateUser(user);
if (upd > 0)
{
// 鏇存柊缂撳瓨鐢ㄦ埛淇℃伅
- loginUser.setUser(byId);
+ loginUser.setUser(user);
tokenService.setLoginUser(loginUser);
return success();
}
--
Gitblit v1.9.1