From 6ca0d589e403e8d056da8b6f1b2e22a385d48d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 26 Aug 2025 14:40:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-332=20=E8=8D=A3=E8=AA=89=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E3=80=81=E8=A7=86=E9=A2=91=E3=80=81=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E3=80=81=E8=B5=84=E6=96=99=E7=9A=84=E5=8F=91=E5=B8=83=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=8F=AF=E4=BB=A5=E6=89=B9=E9=87=8F=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/service/impl/ProductCaseServiceImpl.java | 6 ++---- .../repository/service/impl/ProductHonorServiceImpl.java | 6 ++---- .../service/impl/ProductModelImageServiceImpl.java | 6 ++---- .../service/impl/ProductModelVideoServiceImpl.java | 6 ++---- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseServiceImpl.java index d8710038..3d4de8db 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductCaseServiceImpl.java @@ -152,17 +152,15 @@ public class ProductCaseServiceImpl extends ServiceImpl list = listByIds(request.getIds()); - List names = list.stream().filter(ph -> Objects.equals(ph.getState(), request.getState())).map(ProductCase::getTitle).collect(Collectors.toList()); - VUtils.trueThrowBusinessError(CollectionUtil.isNotEmpty(names)) - .throwMessage("以下案例不需要设置为" + PublishState.findByValue(request.getState()).getDescription() + "：" + StrUtil.join(",", names)); if (Objects.equals(request.getState(), PublishState.Published.getState())) { - names = list.stream().filter(ph -> !ph.getEnable()).map(ProductCase::getTitle).collect(Collectors.toList()); + List names = list.stream().filter(ph -> !ph.getEnable()).map(ProductCase::getTitle).collect(Collectors.toList()); VUtils.trueThrowBusinessError(CollectionUtil.isNotEmpty(names)).throwMessage("以下案例被禁用不能发布：" + StrUtil.join(",", names)); } list.forEach(it -> publish(it, request.getState())); } private void publish(ProductCase info, Integer state) { + if (Objects.equals(state, info.getState())) return; if (Objects.equals(state, PublishState.Published.getState())) { info.setState(PublishState.Published.getState()); info.setPublishBy(AdminUserUtil.getUserName()); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java index cdac2e73..65ff79dd 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java @@ -111,17 +111,15 @@ public class ProductHonorServiceImpl extends ServiceImpl list = listByIds(request.getIds()); - List names = list.stream().filter(ph -> Objects.equals(ph.getState(), request.getState())).map(ProductHonor::getTitle).collect(Collectors.toList()); - VUtils.trueThrowBusinessError(CollectionUtil.isNotEmpty(names)) - .throwMessage("以下荣誉不需要设置为" + PublishState.findByValue(request.getState()).getDescription() + "：" + StrUtil.join(",", names)); if (Objects.equals(request.getState(), PublishState.Published.getState())) { - names = list.stream().filter(ph -> !ph.getEnable()).map(ProductHonor::getTitle).collect(Collectors.toList()); + List names = list.stream().filter(ph -> !ph.getEnable()).map(ProductHonor::getTitle).collect(Collectors.toList()); VUtils.trueThrowBusinessError(CollectionUtil.isNotEmpty(names)).throwMessage("以下荣誉被禁用不能发布：" + StrUtil.join(",", names)); } list.forEach(it -> publish(it, request.getState())); } private void publish(ProductHonor info, Integer state) { + if (Objects.equals(state, info.getState())) return; if (Objects.equals(state, PublishState.Published.getState())) { info.setState(PublishState.Published.getState()); info.setPublishBy(AdminUserUtil.getUserName()); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java index 055e311f..fbfbacd2 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java @@ -93,17 +93,15 @@ public class ProductModelImageServiceImpl extends ServiceImpl list = listByIds(request.getIds()); - List names = list.stream().filter(ph -> Objects.equals(ph.getState(), request.getState())).map(ProductModelImage::getName).collect(Collectors.toList()); - VUtils.trueThrowBusinessError(CollectionUtil.isNotEmpty(names)) - .throwMessage("以下图片不需要设置为" + PublishState.findByValue(request.getState()).getDescription() + "：" + StrUtil.join(",", names)); if (Objects.equals(request.getState(), PublishState.Published.getState())) { - names = list.stream().filter(ph -> !ph.getEnable()).map(ProductModelImage::getName).collect(Collectors.toList()); + List names = list.stream().filter(ph -> !ph.getEnable()).map(ProductModelImage::getName).collect(Collectors.toList()); VUtils.trueThrowBusinessError(CollectionUtil.isNotEmpty(names)).throwMessage("以下图片被禁用不能发布：" + StrUtil.join(",", names)); } list.forEach(it -> publish(it, request.getState())); } private void publish(ProductModelImage info, Integer state) { + if (Objects.equals(state, info.getState())) return; if (Objects.equals(state, PublishState.Published.getState())) { VUtils.trueThrowBusinessError(!info.getEnable()).throwMessage("不能发布已禁用的数据"); info.setState(PublishState.Published.getState()); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java index 54d0001c..f9144c44 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java @@ -114,17 +114,15 @@ public class ProductModelVideoServiceImpl extends ServiceImpl list = listByIds(request.getIds()); - List names = list.stream().filter(ph -> Objects.equals(ph.getState(), request.getState())).map(ProductModelVideo::getName).collect(Collectors.toList()); - VUtils.trueThrowBusinessError(CollectionUtil.isNotEmpty(names)) - .throwMessage("以下视频不需要设置为" + PublishState.findByValue(request.getState()).getDescription() + "：" + StrUtil.join(",", names)); if (Objects.equals(request.getState(), PublishState.Published.getState())) { - names = list.stream().filter(ph -> !ph.getEnable()).map(ProductModelVideo::getName).collect(Collectors.toList()); + List names = list.stream().filter(ph -> !ph.getEnable()).map(ProductModelVideo::getName).collect(Collectors.toList()); VUtils.trueThrowBusinessError(CollectionUtil.isNotEmpty(names)).throwMessage("以下视频被禁用不能发布：" + StrUtil.join(",", names)); } list.forEach(it -> publish(it, request.getState())); } private void publish(ProductModelVideo info, Integer state) { + if (Objects.equals(state, info.getState())) return; if (Objects.equals(state, PublishState.Published.getState())) { info.setState(PublishState.Published.getState()); info.setPublishBy(AdminUserUtil.getUserName());