From ef1d4e1dcc43acc58a9cf7cae1b3a34ed394cb83 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 25 Aug 2021 11:48:23 +0800
Subject: [PATCH] screen-manage               修复组织模块日志BUG

---
 screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java |   59 +++--------------------------------------------------------
 1 files changed, 3 insertions(+), 56 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 020db1e..7dd0a4a 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -394,62 +394,6 @@
 
 
     /**
-     * @Description: ���������������������������
-     * @Param: [updateForm, newOrganization, oldOrganization]
-     * @return: void
-     * @Author: ���������
-     * @Date: 2021/4/8
-     */
-    private void insertUpdateLog(OrganizationUpdateForm updateForm, Organization newOrganization, Organization oldOrganization) {
-        //������������������
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-        StringBuilder content = new StringBuilder();
-        content.append("������������������").append(oldOrganization.getName()).append(";");
-        //������������Map,���������������������������������
-        Map<String, Object> newParameters = JSONObject.parseObject(JSON.toJSONString(updateForm), Map.class);
-        Map<String, Object> oldParameters = JSONObject.parseObject(JSON.toJSONString(oldOrganization), Map.class);
-        //������������������������Map���������������������������
-        Set<String> keys = organizationFormMap.keySet();
-        for (String key : keys) {
-            String value = organizationFormMap.get(key);//���������������������
-            if ("parentName".equals(key)) {//���������������������������
-                if (updateForm.getParentId() != null) {//������������������������������������
-                    String oldParentName = "���";
-                    String newParentName = "���";
-                    if (!oldOrganization.getParentId().equals(0)) {
-                        oldParentName = organizationMapper.selectById(oldOrganization.getParentId()).getName();
-                    }
-                    if (!newOrganization.getParentId().equals(0)) {
-                        newParentName = organizationMapper.selectById(newOrganization.getParentId()).getName();
-                    }
-                    content.append(value + ":" + oldParentName + "->" + newParentName + ";");
-                }
-            } else if ("expireTime".equals(key)) {//expireTime������������������������
-                if (updateForm.getExpireTime() != null) {
-                    Date oldExpireTime = oldOrganization.getExpireTime();
-                    Date newExpireTime = newOrganization.getExpireTime();
-                    String oldExpireTimeStr = DateUtils.dateToDateString(oldExpireTime, "yyyy-MM-dd");
-                    String newExpireTimeStr = DateUtils.dateToDateString(newExpireTime, "yyyy-MM-dd");
-                    content.append(value + ":" + oldExpireTimeStr + "->" + newExpireTimeStr + ";");
-                }
-            } else {//������������������
-                if (newParameters.get(key) != null) {
-                    String newValue = "���";
-                    String oldValue = "���";
-                    if (newParameters.get(key) != null && !newParameters.get(key).equals(" ")) {
-                        newValue = String.valueOf(newParameters.get(key));
-                    }
-                    if (oldParameters.get(key) != null && !oldParameters.get(key).equals(" ")) {
-                        oldValue = String.valueOf(oldParameters.get(key));
-                    }
-                    content.append(value + ":" + oldValue + "->" + newValue + ";");
-                }
-            }
-        }
-        logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
-    }
-
-    /**
      * @Description: ������������������������������������
      * @Param: []
      * @return: java.util.List<com.moral.api.entity.Organization>
@@ -542,6 +486,9 @@
                 result.setFieldAnnoName("������������");
             }
         }
+
+        String content = CompareFieldUtils.resultsConvertContent(results, "���������������");
+        logUtils.saveOperationForManage(content, Constants.UPDATE_OPERATE_TYPE);
     }
 
 

--
Gitblit v1.8.0