From 20c644e44d92fa02b873fb6189eee71615bc12d2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 13 Oct 2023 14:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
index 099046a..ea017d0 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
@@ -50,9 +50,6 @@
GroupService groupService;
@Autowired
GroupMenuMapper groupMenuMapper;
- @Autowired
- LogUtils logUtils;
-
@Override
public MenuQueryDTO queryAllMenus() {
@@ -184,7 +181,7 @@
content.append("������������������" + menuMapper.selectById(childrenId).getName() + ";");
}
}
- logUtils.saveOperationForManage(content.toString(), Constants.DELETE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(content.toString(), Constants.DELETE_OPERATE_TYPE);
//������������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -435,7 +432,7 @@
}
}
String content = CompareFieldUtils.resultsConvertContent(compareResult, "���������������������");
- logUtils.saveOperationForManage(content, Constants.UPDATE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(content, Constants.UPDATE_OPERATE_TYPE);
}
/**
@@ -448,7 +445,7 @@
private void insertLog(Menu menu) {
StringBuilder content = new StringBuilder();
//������������������������������������������
- if (menu.getParentId() == null) {
+ if (menu.getParentId().equals(0)) {
content.append("������������������������;");
} else {
content.append("������������������������;");
@@ -460,7 +457,7 @@
if (menu.getUrl() != null)
content.append("url���" + menu.getUrl() + ";");
content.append("���������" + menu.getOrder() + ";");
- logUtils.saveOperationForManage(content.toString(), Constants.INSERT_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(content.toString(), Constants.INSERT_OPERATE_TYPE);
}
}
--
Gitblit v1.8.0