From d1909e7cfe2b6439666d59b9dce93b7431613289 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Wed, 6 Nov 2024 15:44:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=AA=E5=99=A8CMS=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/jeecg/config/shiro/ShiroConfig.java  |  2 ++
 .../controller/DisciplineFieidController.java     | 10 ++++++++++
 .../controller/InstrumentTypeController.java      | 15 +++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
index 0b61b4b..a76b18e 100644
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@@ -86,6 +86,8 @@ public class ShiroConfig {
         // 配置不会被拦截的链接 顺序判断
         filterChainDefinitionMap.put("/instrument/instrument/listcms", "anon"); //cms仪器资源接口
         filterChainDefinitionMap.put("/instrument/instrument/queryByIdCms", "anon"); //cms仪器资源接口
+        filterChainDefinitionMap.put("/disciplinefieid/disciplineFieid/listcms", "anon"); //cms学科领域接口
+        filterChainDefinitionMap.put("/instrumenttype/instrumentType/listcms", "anon"); //cms仪器分类接口
         filterChainDefinitionMap.put("/expert/expert/listadminCMS", "anon"); //cms专家模块不拦截
         filterChainDefinitionMap.put("/expert/expert/directioncalListCMS", "anon"); //cms专家模块不拦截
         filterChainDefinitionMap.put("/expert/expert/CMSexpinfo", "anon"); //cms专家模块不拦截
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/disciplinefieid/controller/DisciplineFieidController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/disciplinefieid/controller/DisciplineFieidController.java
index ac8767c..9e52820 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/disciplinefieid/controller/DisciplineFieidController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/disciplinefieid/controller/DisciplineFieidController.java
@@ -75,6 +75,16 @@ public class DisciplineFieidController extends JeecgController<DisciplineFieid,
 		return Result.OK(pageList);
 	}
 
+
+	 @ApiOperation(value="学科领域-分页列表查询", notes="学科领域-分页列表查询")
+	 @GetMapping(value = "/listcms")
+	 public Result<List<DisciplineFieid>> listcms() {
+		 QueryWrapper<DisciplineFieid> queryWrapper = new QueryWrapper();
+		 List<DisciplineFieid> pageList = disciplineFieidService.list(queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
+
 	/**
 	 *   添加
 	 *
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrumenttype/controller/InstrumentTypeController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrumenttype/controller/InstrumentTypeController.java
index 9f12172..92ae2e5 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrumenttype/controller/InstrumentTypeController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrumenttype/controller/InstrumentTypeController.java
@@ -75,6 +75,21 @@ public class InstrumentTypeController extends JeecgController<InstrumentType, II
 		return Result.OK(pageList);
 	}
 
+	 /**
+	  * 分页列表查询
+	  *
+
+	  * @return
+	  */
+	 //@AutoLog(value = "仪器分类-分页列表查询")
+	 @ApiOperation(value="仪器分类-分页列表查询", notes="仪器分类-分页列表查询")
+	 @GetMapping(value = "/listcms")
+	 public Result<List<InstrumentType>> listcms() {
+		 QueryWrapper<InstrumentType> queryWrapper = new QueryWrapper();
+		 List<InstrumentType> pageList = instrumentTypeService.list(queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
 	/**
 	 *   添加
 	 *