From 82fbbf24939e150ee3cef90dc0dd843c9897a7e6 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期六, 23 五月 2020 12:27:13 +0800
Subject: [PATCH] 添加 log前 去除bak文件前的备份
---
src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java b/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java
index d071848..7d4f9b4 100644
--- a/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java
+++ b/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java
@@ -479,7 +479,9 @@
String maintainFieldId = masterAuthor.getMaintainFieldId();
String tableName = masterAuthor.getTableName();
List<Maintain> maintainByMaintainField = maintainFieldService.getMaintainByMaintainField(maintainFieldId, tableName);
- maintainSet.addAll(maintainByMaintainField);
+ if (maintainByMaintainField != null && !maintainByMaintainField.isEmpty()) {
+ maintainSet.addAll(maintainByMaintainField);
+ }
}
int unActiveCnt = masterAuthorUnactiveService.selectCount(new EntityWrapper<MasterAuthorUnactive>().in("maintain_id", maintainSet).eq("user_id", user.getUserId()));
if (maintainSet.size() != unActiveCnt) {
--
Gitblit v1.8.0