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(); 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/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("", "", "查询了收藏列表"); 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("", "", "获取了标签数据");