diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspecttemplate/InspectTemplateServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspecttemplate/InspectTemplateServiceImpl.java index 9b3727b..dfe1238 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspecttemplate/InspectTemplateServiceImpl.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspecttemplate/InspectTemplateServiceImpl.java @@ -67,15 +67,31 @@ public class InspectTemplateServiceImpl implements InspectTemplateService { @Override public List getcategory(String type){ List list1 = new ArrayList<>(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("type", type); - List doList=templateMapper.selectList(queryWrapper); - for (InspectTemplateDO inspectTemplateDO : doList) { - String category = inspectTemplateDO.getCategory(); - if (!list1.contains(category)) { // 判断是否已经存在 - list1.add(category); + if(type==null&&type.equals("")) + { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("DISTINCT category"); + List doList = templateMapper.selectList(queryWrapper); + for (InspectTemplateDO inspectTemplateDO : doList) { + if(inspectTemplateDO!=null) + { + list1.add(inspectTemplateDO.getCategory()); + } } } + else + { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("type", type); + List doList=templateMapper.selectList(queryWrapper); + for (InspectTemplateDO inspectTemplateDO : doList) { + String category = inspectTemplateDO.getCategory(); + if (!list1.contains(category)) { // 判断是否已经存在 + list1.add(category); + } + } + } + return list1; } @Override