From 4686da41b376617f6d447b3546c045ce54f032fa Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 16:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 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 ee96e9e..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
@@ -309,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);

--
Gitblit v1.8.0