From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
index 8b8c2f1..f62a6f5 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
@@ -63,8 +63,6 @@
ManageMenuService manageMenuService;
@Autowired
ManageAccountRoleMapper manageAccountRoleMapper;
- @Autowired
- LogUtils logUtils;
/**
* @Description: ������������
@@ -124,7 +122,7 @@
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
StringBuilder content = new StringBuilder();
content.append(manageAccount.getUserName()).append("���������������������;");
- logUtils.saveLoginForManage(request, content.toString(), manageAccount, manageAccount.getUserName());
+ LogUtils.saveLoginForManage(request, content.toString(), manageAccount, manageAccount.getUserName());
return loginDTO;
}
@@ -311,6 +309,13 @@
accountDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
return accountDTO;
}
+ //���������������������������
+ AccountInfoDTO accountInfo = (AccountInfoDTO) TokenUtils.getUserInfo();
+ if(accountInfo.getAccount().getId().equals(accountId)){
+ accountDTO.setCode(ResponseCodeEnum.CANNOT_DELETE_ONESELF.getCode());
+ accountDTO.setMsg(ResponseCodeEnum.CANNOT_DELETE_ONESELF.getMsg());
+ return accountDTO;
+ }
//������������������
UpdateWrapper<ManageAccount> deleteAccountWrapper = new UpdateWrapper<>();
deleteAccountWrapper.eq("id", accountId);
@@ -384,7 +389,7 @@
if(!ObjectUtils.isEmpty(newAccount.getPassword()))
content.append("���������������");
String resultContent = CompareFieldUtils.resultsConvertContent(results,content.toString());
- logUtils.saveOperationForManage(resultContent, Constants.UPDATE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(resultContent, Constants.UPDATE_OPERATE_TYPE);
}
/**
@@ -398,7 +403,7 @@
StringBuilder content = new StringBuilder();
content.append("������������������������").append(manageAccount.getUserName() + ";")
.append("account���" + manageAccount.getAccount() + ";");
- logUtils.saveOperationForManage(content.toString(), Constants.INSERT_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(content.toString(), Constants.INSERT_OPERATE_TYPE);
}
@@ -413,7 +418,7 @@
StringBuilder content = new StringBuilder();
content.append("������������������").append(manageAccount.getUserName() + ";")
.append("������:" + manageAccount.getAccount() + ";");
- logUtils.saveOperationForManage( content.toString(), Constants.DELETE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage( content.toString(), Constants.DELETE_OPERATE_TYPE);
}
}
--
Gitblit v1.8.0