From 8b0fdfd069333f412e6a7cd73bf68cebec66f4ed Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 12 Apr 2021 15:52:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

---
 screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 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 5b50ee5..6bbb7cf 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
@@ -142,7 +142,7 @@
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         StringBuilder content = new StringBuilder();
         content.append(manageAccount.getUserName()).append("���������������������;");
-        logUtils.saveLoginForManage(request, content.toString(), manageAccount.getId(), manageAccount.getUserName());
+        logUtils.saveLoginForManage(request, content.toString(), manageAccount, manageAccount.getUserName());
 
         return loginDTO;
     }
@@ -221,9 +221,9 @@
         //������������������
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         StringBuilder content = new StringBuilder();
-        content.append("������������������").append(manageAccount.getUserName() + ";")
-                .append("id���" + manageAccount.getId() + ";");
-        logUtils.saveOperationForManage(request, content.toString());
+        content.append("������������������").append(manageAccount.getUserName() + ";")
+                .append("account���" + manageAccount.getAccount() + ";");
+        logUtils.saveOperationForManage(request, content.toString(),Constants.INSERT_OPERATE_TYPE);
 
         return accountDTO;
     }
@@ -344,9 +344,9 @@
         //������������������
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         StringBuilder content = new StringBuilder();
-        content.append("������������������").append(existManageAccount.getUserName() + ";")
-                .append("id���" + existManageAccount.getId() + ";");
-        logUtils.saveOperationForManage(request, content.toString());
+        content.append("������������������").append(existManageAccount.getUserName() + ";")
+                .append("���������" + existManageAccount.getAccount() + ";");
+        logUtils.saveOperationForManage(request, content.toString(),Constants.DELETE_OPERATE_TYPE);
 
         return accountDTO;
     }
@@ -436,8 +436,8 @@
         //������������������
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         StringBuilder content = new StringBuilder();
-        content.append("������������������").append(oldAccount.getUserName() + ";")
-                .append("id���" + oldAccount.getId() + ";");
+        content.append("������������������").append(oldAccount.getUserName() + ";")
+                .append("���������" + oldAccount.getAccount() + ";");
         //������������Map,���������������������������������
         Map<String, Object> newParameters = JSONObject.parseObject(JSON.toJSONString(updateForm), Map.class);
         Map<String, Object> oldParameters = JSONObject.parseObject(JSON.toJSONString(oldAccount), Map.class);
@@ -500,7 +500,7 @@
                 }
             }
         }
-        logUtils.saveOperationForManage(request, content.toString());
+        logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
     }
 
 

--
Gitblit v1.8.0