Browse Source

优化字典逻辑

zhou-hao 6 years ago
parent
commit
922d1f317f

+ 5 - 2
hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/BoostDictDefineRepository.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.event.TransactionalEventListener;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -66,11 +67,13 @@ public class BoostDictDefineRepository extends DefaultDictDefineRepository {
     public List<DictDefine> getAllDefine() {
         List<DictDefine> all = dictionaryService.select()
                 .stream()
+                .filter(e -> DataStatus.STATUS_ENABLED.equals(e.getStatus()))
                 .map(dict -> DefaultDictDefine.builder()
                         .id(dict.getId())
                         .comments(dict.getDescribe())
-                        .items((List) new ArrayList<>(dict.getItems()))
-                        .build()).collect(Collectors.toList());
+                        .items(dict.getItems() == null ? Collections.emptyList() : (List) new ArrayList<>(dict.getItems()))
+                        .build())
+                .collect(Collectors.toList());
 
         all.addAll(super.getAllDefine());
         return all;