14468 三项数据库都有 新增 还显示之前弹窗的数据
parent
dc441e5cef
commit
f29b14b754
|
@ -135,7 +135,7 @@ public class TextLibraryServiceImpl implements TextLibraryService {
|
||||||
if (info != null && info.size() > 0) {
|
if (info != null && info.size() > 0) {
|
||||||
List<PageData> _labels = libraryLabelsMapper.findBylibraryId(info);
|
List<PageData> _labels = libraryLabelsMapper.findBylibraryId(info);
|
||||||
if ("0".equals(info.getString("ASSOCIATION")) || "1".equals(info.getString("ASSOCIATION")) || "2".equals(info.getString("ASSOCIATION"))) {
|
if ("0".equals(info.getString("ASSOCIATION")) || "1".equals(info.getString("ASSOCIATION")) || "2".equals(info.getString("ASSOCIATION"))) {
|
||||||
info.put("labels", _labels.stream().filter(n -> n.get("BUS_LABEL_FACTORY_ID") != null).collect(Collectors.toList()));
|
info.put("labels", _labels.stream().filter(n -> (n.get("BUS_LABEL_FACTORY_ID") != null && org.apache.commons.lang3.StringUtils.isNotBlank(n.getString("BUS_LABEL_FACTORY_ID")))).collect(Collectors.toList()));
|
||||||
info.put("TYPES", _labels.stream().filter(n -> n.get("CATEGORY") != null).filter(n -> n.getString("CATEGORY").equals("TYPES")).map(Warden::addDic).collect(Collectors.toList()));
|
info.put("TYPES", _labels.stream().filter(n -> n.get("CATEGORY") != null).filter(n -> n.getString("CATEGORY").equals("TYPES")).map(Warden::addDic).collect(Collectors.toList()));
|
||||||
info.put("SPECIFICATION_TYPES", _labels.stream().filter(n -> n.get("CATEGORY") != null).filter(n -> n.getString("CATEGORY").equals("SPECIFICATION_TYPES")).map(Warden::addDic).collect(Collectors.toList()));
|
info.put("SPECIFICATION_TYPES", _labels.stream().filter(n -> n.get("CATEGORY") != null).filter(n -> n.getString("CATEGORY").equals("SPECIFICATION_TYPES")).map(Warden::addDic).collect(Collectors.toList()));
|
||||||
info.put("CATEGORY_LIST", _labels.stream().filter(n -> n.get("CATEGORY") != null).filter(n -> n.getString("CATEGORY").equals("CATEGORY_LIST")).map(Warden::addDic).collect(Collectors.toList()));
|
info.put("CATEGORY_LIST", _labels.stream().filter(n -> n.get("CATEGORY") != null).filter(n -> n.getString("CATEGORY").equals("CATEGORY_LIST")).map(Warden::addDic).collect(Collectors.toList()));
|
||||||
|
|
Loading…
Reference in New Issue