diff --git a/backend/src/main/java/io/dataease/mobile/service/DirService.java b/backend/src/main/java/io/dataease/mobile/service/DirService.java index 79abaa2c7b..d280d2dd8e 100644 --- a/backend/src/main/java/io/dataease/mobile/service/DirService.java +++ b/backend/src/main/java/io/dataease/mobile/service/DirService.java @@ -12,16 +12,18 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @Service public class DirService { + private static final String[] filterDirNames = { "i18n_panel_list", "i18n_default_panel" }; + @Resource private MobileDirMapper mobileDirMapper; - public List permissions() { CurrentUserDto user = AuthUtils.getUser(); Long userId = user.getUserId(); @@ -43,13 +45,14 @@ public class DirService { String userId = String.valueOf(AuthUtils.getUser().getUserId()); List panelEntities = new ArrayList<>(); if (StringUtils.isNotBlank(request.getName())) { - panelEntities = mobileDirMapper.queryWithName(request.getName(),userId); - }else { - panelEntities = mobileDirMapper.query(request.getPid(),userId); + panelEntities = mobileDirMapper.queryWithName(request.getName(), userId); + } else { + panelEntities = mobileDirMapper.query(request.getPid(), userId); } - if (CollectionUtils.isEmpty(panelEntities)) return null; - - List dtos = panelEntities.stream().map(data -> { + if (CollectionUtils.isEmpty(panelEntities)) + return null; + List filterLists = Arrays.asList(filterDirNames); + List dtos = panelEntities.stream().filter(dto -> !filterLists.contains(dto.getText())).map(data -> { DirItemDTO dirItemDTO = new DirItemDTO(); dirItemDTO.setId(data.getId()); dirItemDTO.setText(data.getText()); @@ -63,5 +66,4 @@ public class DirService { return CommonBeanFactory.getBean(DirService.class); } - } diff --git a/mobile/src/pages/tabBar/dir/search.vue b/mobile/src/pages/tabBar/dir/search.vue index 666f923f85..cc4cabc957 100644 --- a/mobile/src/pages/tabBar/dir/search.vue +++ b/mobile/src/pages/tabBar/dir/search.vue @@ -89,7 +89,7 @@ export default { const param = {name: val} requestDir(param).then(res => { let dataObj = res.data - dataObj.map(item => { + dataObj && dataObj.map(item => { item.name = item.text return util.dataHandle(item, val); });