二期模板维护获取模板类型

icssman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -185,7 +185,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         //获取模板信息
         QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
         moduleInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("relation_id", "0");
+                .eq("relation_id", "-1");
         if (getModuleInfoVO.getModuleType() != null) {
             moduleInfoQueryWrapper.eq("module_type", getModuleInfoVO.getModuleType());
         }
@@ -419,13 +419,10 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         dictionaryInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("group_type", 4)
                 .eq("return_type", 1)
+                .notIn("val",types)
                 .orderByAsc("order_no");
         if(getModuleTypeVO.getRelationId().intValue() == -1){//如果是-1时返回所有子模板
-            dictionaryInfoQueryWrapper.eq("val","322")
-                    .eq("val","31")
-                    .eq("val","32");
-        }else {
-            dictionaryInfoQueryWrapper.notIn("val",types);
+            dictionaryInfoQueryWrapper.in("val","322","31","32");
         }
         List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
         List<GetModuleTypeDTO> getModuleTypeDTOS = new ArrayList<>();