From 0ab47590c8964355014cb56f085808a206d03b2f Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 25 四月 2022 10:26:38 +0800
Subject: [PATCH] fix 普通用户修改密码
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
index 9ecfcb2..5b89dda 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
@@ -6,6 +6,7 @@
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.ResponseStatusEnums;
+import com.sandu.common.execption.BusinessException;
import com.sandu.common.log.Log;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.LoginUserInfo;
@@ -78,13 +79,30 @@
@Log("淇敼鏅�氱敤鎴风殑瀵嗙爜")
@PostMapping("/updateClientPassword")
public ResponseVO<Object> updateClientPassword(@Validated @RequestBody UserPwsParm param) {
- boolean result = clientService.updateAdminPassword(param);
+ boolean result;
+
+ //瓒呯鐩存帴淇敼
+ if (SecurityUtils.getUserDetails().getAdministratorType().equals(AdministratorEnums.ADMIN.getCode())) {
+ result = clientService.updateAdminPassword(param);
+ } else {
+ //褰撳墠鐧诲綍璐﹀彿ID
+ Long userId = SecurityUtils.getUserId();
+ //瑕佷慨瑕佸瘑鐮佺殑鐢ㄦ埛鐨勪笂绾D
+ Client client = clientService.getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, param.getUserid()));
+ //涓哄叾涓嬪睘鎵嶈兘淇敼
+ if (client != null && userId.equals(client.getSuperiorId())) {
+ result = clientService.updateAdminPassword(param);
+ } else {
+ throw new BusinessException("闈炶秴绾х鐞嗗憳鎴栬鐢ㄦ埛涓嶆槸鎮ㄤ笅灞炵敤鎴凤紝鏃犳硶淇敼瀵嗙爜锛�");
+ }
+ }
if (result) {
return ResponseUtil.success("淇敼鎴愬姛");
} else {
return ResponseUtil.fail("淇敼澶辫触");
}
+
}
@PostMapping("/delete/{id}")
@@ -105,13 +123,15 @@
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
LambdaQueryWrapper<Client> wrapper = Wrappers.lambdaQuery(Client.class);
- if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
- wrapper.eq(Client::getSuperiorId, SecurityUtils.getUserId());
+ if (AdministratorEnums.NORMAL.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+ wrapper.eq(Client::getSuperiorId, SecurityUtils.getUserId()).or(w -> w.eq(
+ Client::getId, SecurityUtils.getUserId()
+ ));
}
if (keyword != null && !keyword.isEmpty()) {
wrapper.like(Client::getClientName, keyword)
- .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getMobile, keyword))
- .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getLinkMan, keyword));
+ .or(w1 -> w1.like(Client::getMobile, keyword))
+ .or(w2 -> w2.like(Client::getLinkMan, keyword));
}
List<Client> clientList = clientService.list(wrapper);
List<ClientDto> clientDtoList = new ArrayList<>();
--
Gitblit v1.9.3