From b67bd85fbe51486dcacf5a5e3b308e4a0f3e2e43 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期日, 24 四月 2022 18:35:42 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 7364182..9ecfcb2 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.log.Log;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.LoginUserInfo;
import com.sandu.common.security.annotation.AnonymousAccess;
@@ -14,10 +15,8 @@
import com.sandu.common.util.IpUtil;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.ClientDto;
-import com.sandu.ximon.admin.param.AddClientPrarm;
-import com.sandu.ximon.admin.param.AdminLoginParam;
-import com.sandu.ximon.admin.param.ResetClientPasswordPrarm;
-import com.sandu.ximon.admin.param.UpdateClientPrarm;
+import com.sandu.ximon.admin.param.*;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.ClientRoleRelationService;
import com.sandu.ximon.admin.service.ClientService;
@@ -25,6 +24,7 @@
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.crypto.password.PasswordEncoder;
@@ -49,6 +49,7 @@
private final RoleService roleService;
private final ClientRoleRelationService clientRoleRelationService;
private final TokenProvider tokenProvider;
+ private PermissionConfig permissionConfig;
@PostMapping("/add")
public ResponseVO<Object> addClient(@RequestBody @Validated AddClientPrarm addClientPrarm) {
@@ -71,10 +72,15 @@
}
}
- @PostMapping("/resetClientPassword")
- public ResponseVO<Object> resetClientPassword(@RequestBody @Validated ResetClientPasswordPrarm resetClientPasswordPrarm) {
- boolean b = clientService.resetPassword(resetClientPasswordPrarm);
- if (b) {
+ /**
+ * 淇敼鏅�氱敤鎴风殑瀵嗙爜
+ */
+ @Log("淇敼鏅�氱敤鎴风殑瀵嗙爜")
+ @PostMapping("/updateClientPassword")
+ public ResponseVO<Object> updateClientPassword(@Validated @RequestBody UserPwsParm param) {
+ boolean result = clientService.updateAdminPassword(param);
+
+ if (result) {
return ResponseUtil.success("淇敼鎴愬姛");
} else {
return ResponseUtil.fail("淇敼澶辫触");
@@ -93,12 +99,16 @@
@GetMapping("/list")
public ResponseVO<Object> listLikeClient(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ if (!permissionConfig.check(MenuEnum.CLIENT_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+
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 (null != keyword) {
+ if (keyword != null && !keyword.isEmpty()) {
wrapper.like(Client::getClientName, keyword)
.or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getMobile, keyword))
.or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getLinkMan, keyword));
--
Gitblit v1.9.3