From 6f67eee1325143911bd41403a8c8b769a0cdfe2a Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期五, 26 七月 2024 15:45:30 +0800
Subject: [PATCH] 方重复
---
project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 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 0916f22..b8220a0 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
@@ -48,7 +48,7 @@
@GetMapping
public AjaxResult profile()
{
- SysUser user = SecurityUtils.getLoginUser().getUser();
+ SysUser user = userService.selectUserById(SecurityUtils.getLoginUser().getUserId());
if ("02".equals(user.getUserType())){
SysCompany company = companyService.getById(userService.getById(user.getUserId()).getDeptId());
SysDept sysDept = new SysDept();
@@ -56,8 +56,10 @@
user.setDept(sysDept);
} else {
SysDept sysDept = deptService.selectDeptById(userService.getById(user.getUserId()).getDeptId());
- sysDept.setDeptName(deptService.getDeptAllName(sysDept.getDeptId()));
- user.setDept(sysDept);
+ if (sysDept!=null){
+ sysDept.setDeptName(deptService.getDeptAllName(sysDept.getDeptId()));
+ user.setDept(sysDept);
+ }
}
// 瑙掕壊闆嗗悎
@@ -134,27 +136,48 @@
* 鏇存崲鎵嬫満鍙�
*/
@Log(title = "鏇存崲鎵嬫満鍙�", businessType = BusinessType.UPDATE)
- @PostMapping("/updatePhone/{phone}")
- public AjaxResult updatePhone(@PathVariable String phone)
+ @PostMapping("/updatePhone/{phone}/{companyId}")
+ public AjaxResult updatePhone(@PathVariable String phone, @PathVariable String companyId)
{
if (StringUtils.isEmpty(phone)){
return error("璇峰～鍐欐墜鏈哄彿");
}
LoginUser loginUser = SecurityUtils.getLoginUser();
- SysUser user = loginUser.getUser();
+ SysUser user = userService.selectUserById(SecurityUtils.getUserId());
+ if ("02".equals(user.getUserType()) && StringUtils.isNotEmpty(companyId)){//浼佷笟
+ //澶氫紒涓氳处鎴锋洿鎹㈠彿鐮�
+ //鏂板彿鐮佷笉瀛樺湪锛�
+ SysUser one = userService.getOne(userService.lq().eq(SysUser::getPhonenumber, phone));
+ if (one!=null && !"02".equals(one.getUserType())){
+ return error("璇ユ墜鏈哄彿涓嶆槸浼佷笟鍙风爜鑼冨洿锛岃鏇存崲鍙风爜");
+ }
+ if (companyService.count(SysCompany::getCompanyPhone, user.getPhonenumber())==1){
+ userService.deleteUserByCompanyPhone(user.getPhonenumber());
+ }
+ if (one==null){ //涓嶅瓨鍦�,娣诲姞浼佷笟璐︽埛
+ SysCompany company = companyService.getById(Long.parseLong(companyId));
+ company.setCompanyPhone(phone);
+ companyService.addCompanyUser(company, 1);
+ }
+ //淇敼浼佷笟鐢佃瘽
+ companyService.update(companyService.lu().set(SysCompany::getCompanyPhone, phone).eq(SysCompany::getCompanyId, Long.parseLong(companyId)));
+ return success(1);
+ }
user.setPhonenumber(phone);
+
if (StringUtils.isNotEmpty(user.getPhonenumber())
- && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+ && 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 success(0);
}
return error("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
--
Gitblit v1.9.1