From 36a11d78a2517b523fcf6b6ec622f3f0767f553f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 11:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java
index a345e1c..6e6b891 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java
@@ -39,9 +39,6 @@
@Autowired(required = false)
private DeviceMapper deviceMapper;
- @Autowired
- private LogUtils logUtils;
-
@Override
public List<Map<String, Object>> getData(Map map) {
int organization_id = Integer.parseInt(map.get("organization_id").toString());
@@ -77,7 +74,7 @@
content = content +organizationLayout.getId()+" ";
}
content = content+";";
- logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
}
if (!ObjectUtils.isEmpty(list) && list.size()>0){
organizationLayoutMapper.insertList(list);
@@ -92,7 +89,7 @@
contentInsert = contentInsert + organizationLayout.getId()+" ";
}
contentInsert = contentInsert+";";
- logUtils.saveOperationForManage(request,contentInsert,Constants.INSERT_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request,contentInsert,Constants.INSERT_OPERATE_TYPE);
}
}
--
Gitblit v1.8.0