From 484bc1f21e7d29b480005f9c7077b03c64d8f86e Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 20:14:11 +0800
Subject: [PATCH] 审批，投诉，报表修改
---
project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java | 67 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 16 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 48741d9..0916f22 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,22 +1,11 @@
package com.project.admin.controller.system;
-import com.project.common.config.ProjectConfig;
-import com.project.common.core.domain.entity.SysDept;
-import com.project.framework.web.service.SysPermissionService;
-import com.project.system.service.ISysDeptService;
-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;
@@ -24,8 +13,15 @@
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;
@@ -43,6 +39,7 @@
private final ISysDeptService deptService;
private final TokenService tokenService;
private final SysPermissionService permissionService;
+ private final ISysCompanyService companyService;
/**
@@ -52,9 +49,17 @@
public AjaxResult profile()
{
SysUser user = SecurityUtils.getLoginUser().getUser();
- SysDept sysDept = deptService.selectDeptById(userService.getById(user.getUserId()).getDeptId());
- sysDept.setDeptName(deptService.getDeptAllName(sysDept.getDeptId()));
- user.setDept(sysDept);
+ 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);
// 鏉冮檺闆嗗悎
@@ -96,6 +101,7 @@
return error("淇敼涓汉淇℃伅寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
+
/**
* 閲嶇疆瀵嗙爜
*/
@@ -125,6 +131,35 @@
}
/**
+ * 鏇存崲鎵嬫満鍙�
+ */
+ @Log(title = "鏇存崲鎵嬫満鍙�", businessType = BusinessType.UPDATE)
+ @PostMapping("/updatePhone/{phone}")
+ public AjaxResult updatePhone(@PathVariable String phone)
+ {
+ if (StringUtils.isEmpty(phone)){
+ return error("璇峰～鍐欐墜鏈哄彿");
+ }
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ SysUser user = loginUser.getUser();
+ user.setPhonenumber(phone);
+ if (StringUtils.isNotEmpty(user.getPhonenumber())
+ && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+ {
+ return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
+ }
+ if (userService.resetPhone(user.getUserId(), phone) > 0)
+ {
+ // 鏇存柊缂撳瓨
+ loginUser.getUser().setUserName(phone);
+ loginUser.getUser().setPhonenumber(phone);
+ tokenService.setLoginUser(loginUser);
+ return success();
+ }
+ return error("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ /**
* 澶村儚涓婁紶
*/
@Log(title = "鐢ㄦ埛澶村儚", businessType = BusinessType.UPDATE)
--
Gitblit v1.9.1