diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/message/service/impl/DevMessageServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/message/service/impl/DevMessageServiceImpl.java index dd3698a6..94c3c150 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/message/service/impl/DevMessageServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/message/service/impl/DevMessageServiceImpl.java @@ -90,7 +90,7 @@ public class DevMessageServiceImpl extends ServiceImpl() + queryWrapper.lambda().in(DevMessage::getId, devRelationService.list(new LambdaQueryWrapper() .eq(DevRelation::getCategory, DevRelationCategoryEnum.MSG_TO_USER.getValue()) .eq(DevRelation::getTargetId, devMessagePageParam.getReceiveUserId())).stream() .map(DevRelation::getObjectId).collect(Collectors.toList())); diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/controller/MobileMenuController.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/controller/MobileMenuController.java index bbfbb928..1dae031a 100644 --- a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/controller/MobileMenuController.java +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/controller/MobileMenuController.java @@ -130,7 +130,7 @@ public class MobileMenuController { * @author xuyuxiang * @date 2022/4/24 20:00 */ - @ApiOperationSupport(order = 8) + @ApiOperationSupport(order = 6) @ApiOperation("获取模块选择器") @GetMapping("/mobile/menu/moduleSelector") public CommonResult> moduleSelector(MobileMenuSelectorModuleParam mobileMenuSelectorModuleParam) { @@ -143,7 +143,7 @@ public class MobileMenuController { * @author xuyuxiang * @date 2022/4/24 20:00 */ - @ApiOperationSupport(order = 9) + @ApiOperationSupport(order = 7) @ApiOperation("获取菜单树选择器") @GetMapping("/mobile/menu/menuTreeSelector") public CommonResult>> menuTreeSelector(MobileMenuSelectorMenuParam mobileMenuSelectorMenuParam) { diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/index/service/impl/SysIndexServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/index/service/impl/SysIndexServiceImpl.java index 9f6d0fb9..fa0b4234 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/index/service/impl/SysIndexServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/index/service/impl/SysIndexServiceImpl.java @@ -72,7 +72,7 @@ public class SysIndexServiceImpl implements SysIndexService { @Override public List scheduleList(SysIndexScheduleListParam sysIndexScheduleListParam) { - return sysRelationService.list(new LambdaUpdateWrapper().eq(SysRelation::getObjectId, StpUtil.getLoginIdAsString()) + return sysRelationService.list(new LambdaQueryWrapper().eq(SysRelation::getObjectId, StpUtil.getLoginIdAsString()) .eq(SysRelation::getTargetId, sysIndexScheduleListParam.getScheduleDate()) .eq(SysRelation::getCategory, SysRelationCategoryEnum.SYS_USER_SCHEDULE_DATA.getValue())) .stream().map(sysRelation -> { diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysButtonServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysButtonServiceImpl.java index 3c8c39a9..23493acb 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysButtonServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysButtonServiceImpl.java @@ -130,11 +130,11 @@ public class SysButtonServiceImpl extends ServiceImpl buttonIdList = CollStreamUtil.toList(sysButtonIdParamList, SysButtonIdParam::getId); if(ObjectUtil.isNotEmpty(buttonIdList)) { // 获取按钮的父菜单id集合 - List parentMenuIdList = sysMenuService.list(new LambdaUpdateWrapper().in(SysMenu::getId, buttonIdList) + List parentMenuIdList = sysMenuService.list(new LambdaQueryWrapper().in(SysMenu::getId, buttonIdList) .eq(SysMenu::getCategory, SysResourceCategoryEnum.BUTTON.getValue())).stream().map(SysMenu::getParentId) .collect(Collectors.toList()); if(ObjectUtil.isNotEmpty(parentMenuIdList)) { - sysRelationService.list(new LambdaUpdateWrapper().in(SysRelation::getTargetId, parentMenuIdList) + sysRelationService.list(new LambdaQueryWrapper().in(SysRelation::getTargetId, parentMenuIdList) .eq(SysRelation::getCategory, SysRelationCategoryEnum.SYS_ROLE_HAS_RESOURCE.getValue()) .isNotNull(SysRelation::getExtJson)).forEach(sysRelation -> { JSONObject extJsonObject = JSONUtil.parseObj(sysRelation.getExtJson()); diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysMenuServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysMenuServiceImpl.java index ef5b9a12..51844fe5 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysMenuServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysMenuServiceImpl.java @@ -254,7 +254,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl List sysMenuIdList = CollStreamUtil.toList(sysMenuIdParamList, SysMenuIdParam::getId); if(ObjectUtil.isNotEmpty(sysMenuIdList)) { // 获取菜单下的菜单、按钮 - List allMenuList = this.list(new LambdaUpdateWrapper() + List allMenuList = this.list(new LambdaQueryWrapper() .in(SysMenu::getCategory, CollectionUtil.newArrayList(SysResourceCategoryEnum.MENU.getValue(), SysResourceCategoryEnum.BUTTON.getValue()))); List toDeleteMenuIdList = CollectionUtil.newArrayList(); diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java index a48ebde7..90c5f841 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java @@ -115,7 +115,7 @@ public class SysModuleServiceImpl extends ServiceImpl allMenuList = sysMenuService.list(new LambdaUpdateWrapper() + List allMenuList = sysMenuService.list(new LambdaQueryWrapper() .in(SysMenu::getCategory, CollectionUtil.newArrayList(SysResourceCategoryEnum.MENU.getValue(), SysResourceCategoryEnum.BUTTON.getValue()))); if(ObjectUtil.isNotEmpty(allMenuList)) {