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());