|
@@ -261,9 +261,8 @@ public class AssembleFacade {
|
|
List<Lis> convertLis = Lists.newLinkedList();
|
|
List<Lis> convertLis = Lists.newLinkedList();
|
|
|
|
|
|
lis.forEach(lisRecord -> {
|
|
lis.forEach(lisRecord -> {
|
|
- if (StringUtil.isBlank(lisRecord.getName())) {
|
|
|
|
- convertLis.add(lisRecord);
|
|
|
|
- } else if (StringUtil.isNotBlank(lisRecord.getUniqueName())) {
|
|
|
|
|
|
+ if (StringUtil.isBlank(lisRecord.getName())
|
|
|
|
+ || StringUtil.isNotBlank(lisRecord.getUniqueName())) {
|
|
convertLis.add(lisRecord);
|
|
convertLis.add(lisRecord);
|
|
} else {
|
|
} else {
|
|
Map<String, Long> uniqueNameMap = new HashMap<>();
|
|
Map<String, Long> uniqueNameMap = new HashMap<>();
|
|
@@ -304,9 +303,8 @@ public class AssembleFacade {
|
|
List<Pacs> convertPacs = Lists.newLinkedList();
|
|
List<Pacs> convertPacs = Lists.newLinkedList();
|
|
|
|
|
|
pacs.forEach(pacsRecord -> {
|
|
pacs.forEach(pacsRecord -> {
|
|
- if (StringUtil.isBlank(pacsRecord.getName())) {
|
|
|
|
- convertPacs.add(pacsRecord);
|
|
|
|
- } else if (StringUtil.isNotBlank(pacsRecord.getUniqueName())) {
|
|
|
|
|
|
+ if (StringUtil.isBlank(pacsRecord.getName())
|
|
|
|
+ || StringUtil.isNotBlank(pacsRecord.getUniqueName())) {
|
|
convertPacs.add(pacsRecord);
|
|
convertPacs.add(pacsRecord);
|
|
} else {
|
|
} else {
|
|
Map<String, Long> uniqueNameMap = new HashMap<>();
|
|
Map<String, Long> uniqueNameMap = new HashMap<>();
|
|
@@ -342,9 +340,8 @@ public class AssembleFacade {
|
|
}
|
|
}
|
|
List<Item> convertItem = Lists.newLinkedList();
|
|
List<Item> convertItem = Lists.newLinkedList();
|
|
items.forEach(item -> {
|
|
items.forEach(item -> {
|
|
- if (StringUtil.isBlank(item.getName())) {
|
|
|
|
- convertItem.add(item);
|
|
|
|
- } else if (StringUtil.isNotBlank(item.getUniqueName())) {
|
|
|
|
|
|
+ if (StringUtil.isBlank(item.getName())
|
|
|
|
+ || StringUtil.isNotBlank(item.getUniqueName())) {
|
|
convertItem.add(item);
|
|
convertItem.add(item);
|
|
} else {
|
|
} else {
|
|
Map<String, Long> uniqueNameMap = new HashMap<>();
|
|
Map<String, Long> uniqueNameMap = new HashMap<>();
|