From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java b/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java
index 59766fd..88a9c61 100644
--- a/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java
+++ b/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java
@@ -567,9 +567,7 @@
String maintainFieldId = masterAuthor.getMaintainFieldId();
String tableName = masterAuthor.getTableName();
List<Maintain> maintainByMaintainField = maintainFieldService.getMaintainByMaintainField(maintainFieldId, tableName);
- if (maintainByMaintainField != null && !maintainByMaintainField.isEmpty()) {
- maintainSet.addAll(maintainByMaintainField);
- }
+ 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