From f415fbc559ff64b98a65384c9fb2b56cfba113fe Mon Sep 17 00:00:00 2001
From: lxd <1004405501@qq.com>
Date: Fri, 28 Mar 2025 20:55:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InspectTemplateServiceImpl.java           | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

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<String> getcategory(String type){
         List<String> list1 = new ArrayList<>();
-        QueryWrapper<InspectTemplateDO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type", type);
-       List<InspectTemplateDO>  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<InspectTemplateDO> queryWrapper = new QueryWrapper<>();
+            queryWrapper.select("DISTINCT category");
+            List<InspectTemplateDO> doList = templateMapper.selectList(queryWrapper);
+            for (InspectTemplateDO inspectTemplateDO : doList) {
+                if(inspectTemplateDO!=null)
+                {
+                    list1.add(inspectTemplateDO.getCategory());
+                }
             }
         }
+        else
+        {
+            QueryWrapper<InspectTemplateDO> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("type", type);
+            List<InspectTemplateDO>  doList=templateMapper.selectList(queryWrapper);
+            for (InspectTemplateDO inspectTemplateDO : doList) {
+                String category = inspectTemplateDO.getCategory();
+                if (!list1.contains(category)) { // 判断是否已经存在
+                    list1.add(category);
+                }
+            }
+        }
+
         return list1;
     }
     @Override