From b2c1822dc9ae8a67872193d182d9335d9a99655c Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 15:16:53 +0800
Subject: [PATCH] 执法评价相关添加
---
project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java | 55 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 21 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..f36229a 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,19 +1,11 @@
package com.project.admin.controller.system;
-import com.project.common.config.ProjectConfig;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
import com.project.common.annotation.Log;
+import com.project.common.config.ProjectConfig;
import com.project.common.constant.UserConstants;
import com.project.common.core.controller.BaseController;
import com.project.common.core.domain.AjaxResult;
+import com.project.common.core.domain.entity.SysDept;
import com.project.common.core.domain.entity.SysUser;
import com.project.common.core.domain.model.LoginUser;
import com.project.common.enums.BusinessType;
@@ -21,8 +13,17 @@
import com.project.common.utils.StringUtils;
import com.project.common.utils.file.FileUploadUtils;
import com.project.common.utils.file.MimeTypeUtils;
+import com.project.framework.web.service.SysPermissionService;
import com.project.framework.web.service.TokenService;
+import com.project.system.domain.SysCompany;
+import com.project.system.service.ISysCompanyService;
+import com.project.system.service.ISysDeptService;
import com.project.system.service.ISysUserService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Set;
/**
* 涓汉淇℃伅 涓氬姟澶勭悊
@@ -35,7 +36,10 @@
public class SysProfileController extends BaseController
{
private final ISysUserService userService;
+ private final ISysDeptService deptService;
private final TokenService tokenService;
+ private final SysPermissionService permissionService;
+ private final ISysCompanyService companyService;
/**
@@ -44,8 +48,25 @@
@GetMapping
public AjaxResult profile()
{
- SysUser user = userService.getById(getUserId());
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ if ("02".equals(user.getUserType())){
+ SysCompany company = companyService.getById(userService.getById(user.getUserId()).getDeptId());
+ SysDept sysDept = new SysDept();
+ sysDept.setDeptName(company.getCompanyName());
+ user.setDept(sysDept);
+ } else {
+ SysDept sysDept = deptService.selectDeptById(userService.getById(user.getUserId()).getDeptId());
+ sysDept.setDeptName(deptService.getDeptAllName(sysDept.getDeptId()));
+ user.setDept(sysDept);
+ }
+
+ // 瑙掕壊闆嗗悎
+ Set<String> roles = permissionService.getRolePermission(user);
+ // 鏉冮檺闆嗗悎
+ Set<String> permissions = permissionService.getMenuPermission(user);
AjaxResult ajax = AjaxResult.success(user);
+ ajax.put("roles", roles);
+ ajax.put("permissions", permissions);
ajax.put("roleGroup", userService.selectUserRoleGroup(user.getUserName()));
ajax.put("postGroup", userService.selectUserPostGroup(user.getUserName()));
return ajax;
@@ -59,14 +80,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 +90,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