diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java
index 9170e6d..eee28e2 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java
@@ -76,5 +76,12 @@ public class EdTagLibraryController {
     public ElectromagneticResult<?> listTagTree() {
         return ElectromagneticResultUtil.success(edTagLibraryService.listTagTree());
     }
+
+    // 查看所有标签
+    @GetMapping ("/listAllTags")
+    @UserOperation(value="查看了所有标签", modelName = UserOperationModuleEnum.TAG)
+    public ElectromagneticResult<?> listAllTags() {
+        return ElectromagneticResultUtil.success(edTagLibraryService.listAllTags());
+    }
 }
 
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdTagLibraryService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdTagLibraryService.java
index 0ba6a46..2760ae3 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdTagLibraryService.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdTagLibraryService.java
@@ -5,6 +5,7 @@ import com.electromagnetic.industry.software.common.pojo.TreeNode;
 import com.electromagnetic.industry.software.manage.pojo.models.EdTagLibrary;
 import com.electromagnetic.industry.software.manage.pojo.resp.TagListVO;
 
+import javax.swing.text.html.HTML;
 import java.util.List;
 import java.util.Map;
 
@@ -63,4 +64,10 @@ public interface EdTagLibraryService extends IService<EdTagLibrary> {
      * @return
      */
     List<TreeNode> listTagTree();
+
+    /**
+     * 获取所有标签
+     * @return
+     */
+    List<EdTagLibrary> listAllTags();
 }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java
index 0249c6e..2e7d95d 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java
@@ -300,5 +300,17 @@ public class EdTagLibraryServiceImpl extends ServiceImpl<EdTagLibraryMapper, EdT
         }
         return list;
     }
+
+    /**
+     * 获取所有标签
+     * @return
+     */
+    @Override
+    public List<EdTagLibrary> listAllTags() {
+        LambdaQueryWrapper<EdTagLibrary> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(EdTagLibrary::getIsPublished, PublishEnum.PUBLISHED.getCode())
+                .eq(EdTagLibrary::getType, TagTypeEnum.TAG.getCode());
+        return this.list(queryWrapper);
+    }
 }