diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/CommandSnippetGroupServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/CommandSnippetGroupServiceImpl.java index dcd7b43f..5e13529c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/CommandSnippetGroupServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/CommandSnippetGroupServiceImpl.java @@ -109,6 +109,7 @@ public class CommandSnippetGroupServiceImpl implements CommandSnippetGroupServic .createWrapper() .select(CommandSnippetDO::getUserId, CommandSnippetDO::getGroupId) .isNotNull(CommandSnippetDO::getGroupId) + .groupBy(CommandSnippetDO::getUserId) .groupBy(CommandSnippetDO::getGroupId) .then() .stream() diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java index 605b9b38..e21f4d38 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java @@ -110,6 +110,7 @@ public class PathBookmarkGroupServiceImpl implements PathBookmarkGroupService { .select(PathBookmarkDO::getUserId, PathBookmarkDO::getGroupId) .isNotNull(PathBookmarkDO::getGroupId) .groupBy(PathBookmarkDO::getGroupId) + .groupBy(PathBookmarkDO::getUserId) .then() .stream() .collect(Collectors.groupingBy(PathBookmarkDO::getUserId, diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/PreferenceController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/PreferenceController.java index 708e7cce..0c9e710b 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/PreferenceController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/PreferenceController.java @@ -1,5 +1,6 @@ package com.orion.visor.module.infra.controller; +import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.web.core.annotation.RestWrapper; import com.orion.visor.module.infra.entity.request.preference.PreferenceUpdatePartialRequest; import com.orion.visor.module.infra.entity.request.preference.PreferenceUpdateRequest; @@ -56,6 +57,7 @@ public class PreferenceController { return preferenceService.getPreferenceByType(type, items); } + @IgnoreLog @GetMapping("/get-default") @Operation(summary = "查询默认偏好") @Parameter(name = "type", description = "type", required = true) diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java index 12bf390d..88eaec85 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java @@ -28,7 +28,7 @@ public class TerminalPreferenceStrategy extends AbstractGenericsDataStrategy { setVisible(false); - console.log(cronExpression.value); - console.log('ok', cronExpression.value); emits('ok', cronExpression.value); };