From af819f7cecad3a63d7e7b6417a12f04f3fd6ed86 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Aug 2022 15:16:24 +0800
Subject: [PATCH] 风场模型基准信息相关代码

---
 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