From 2549ca5db4c246322ec03f3a5bd35c00917e6547 Mon Sep 17 00:00:00 2001 From: s2042968 Date: Wed, 5 Mar 2025 16:25:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E6=A0=87=E7=AD=BE=E5=BA=93=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=9E=E8=B0=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/controller/EdTagLibraryController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 196ff41..2bf4d57 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 @@ -23,7 +23,7 @@ public class EdTagLibraryController { private FileTagRelationService fileTagRelationService; // 新建标签组 - @PostMapping("/createGroup") + @GetMapping("/createGroup") @UserOperation(value="创建了标签组", modelName = UserOperationModuleEnum.TAG) public ElectromagneticResult createTagGroup(@RequestParam String tagName) { String createdBy = UserThreadLocal.getUserId(); @@ -31,7 +31,7 @@ public class EdTagLibraryController { } // 在标签组下新建标签 - @PostMapping("/createTag") + @GetMapping("/createTag") @UserOperation(value="创建了标签", modelName = UserOperationModuleEnum.TAG) public ElectromagneticResult createTag(@RequestParam String parentId, @RequestParam String tagName) { String createdBy = UserThreadLocal.getUserId(); @@ -39,7 +39,7 @@ public class EdTagLibraryController { } // 拖拽修改排序/分组 - @PostMapping("/updateOrder") + @GetMapping("/updateOrder") @UserOperation(value="修改了标签顺序", modelName = UserOperationModuleEnum.TAG) public ElectromagneticResult updateTagOrder(@RequestParam String tagId, @RequestParam String newParentId, @RequestParam Integer newOrderBy) { String updatedBy = UserThreadLocal.getUserId(); @@ -47,7 +47,7 @@ public class EdTagLibraryController { } // 发布标签 - @PostMapping("/batchPublish") + @GetMapping("/batchPublish") @UserOperation(value="发布了标签组", modelName = UserOperationModuleEnum.TAG) public ElectromagneticResult publishTag(@RequestParam List tagIds) { return ElectromagneticResultUtil.success(edTagLibraryService.batchPublishTagGroups(tagIds)); @@ -68,7 +68,7 @@ public class EdTagLibraryController { } // 修改标签组/标签 - @PostMapping ("/updateTag") + @GetMapping ("/updateTag") @UserOperation(value="修改了标签组/标签", modelName = UserOperationModuleEnum.TAG) public ElectromagneticResult updateTag(@RequestParam String tagId, @RequestParam String tagName) { String updatedBy = UserThreadLocal.getUserId(); From 6110687938b71ddf2fd2ac588ac427041634beb6 Mon Sep 17 00:00:00 2001 From: s2042968 Date: Wed, 5 Mar 2025 16:39:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E6=9F=A5=E7=9C=8B=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?view=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/service/serviceimpl/EdFileInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java index e267c29..b1d1099 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java @@ -1424,7 +1424,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl permissions = (e.getIsPersonal() == 1) ? permissionService.getPersonalPermission() - : permissionService.getUserPermission(UserThreadLocal.getUserId(), e.getId(), false); + : permissionService.getUserPermission(UserThreadLocal.getUserId(), e.getId(), true); e.setPermissions(permissions); }); UserThreadLocal.setSuccessInfo("", "", "查询了收藏列表"); From 964011b8d94cc39c3ab0ffd9d1ea7e696c426903 Mon Sep 17 00:00:00 2001 From: s2042968 Date: Wed, 5 Mar 2025 16:47:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=8E=A5=E5=8F=A3=E5=87=BA=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../industry/software/manage/pojo/resp/TagListVO.java | 2 +- .../manage/service/serviceimpl/EdTagLibraryServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/TagListVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/TagListVO.java index 993b28e..20ad512 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/TagListVO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/TagListVO.java @@ -17,5 +17,5 @@ public class TagListVO { private Integer orderBy; // 排序字段 private Integer isPublished; // 是否已发布（0: 未发布, 1: 已发布） - private List childList; + private List children; } 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 7afa39a..8153621 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 @@ -208,7 +208,7 @@ public class EdTagLibraryServiceImpl extends ServiceImpl())); + vo.setChildren(tagsGrouped.getOrDefault(group.getTagId(), new ArrayList<>())); result.add(vo); } UserThreadLocal.setSuccessInfo("", "", "获取了标签数据");