From 5339445c5e418de0b000c3ad40a5bc3e240bf5e7 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 28 Jun 2022 10:39:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9-?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=89=88=E6=9C=AC=E6=8F=90=E7=A4=BA=E8=AF=AD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/template/controller/ParamsInfoEOController.java | 2 +- .../template/service/IParamsInfoPublishEOService.java | 2 +- .../service/impl/ParamsInfoPublishEOServiceImpl.java | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java index 3476407dd..ab39e0243 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java @@ -237,7 +237,7 @@ public class ParamsInfoEOController extends JeroController publish(@RequestParam(name="paramsTemplateId") String paramsTemplateId, @RequestParam(name="cut") String cut) { - int publishVersion = paramsInfoPublishEOService.publishTemplate(paramsTemplateId); + int publishVersion = paramsInfoPublishEOService.publishTemplate(paramsTemplateId, cut); if (CutEnum.CN.getValue().equals(cut)) { return Result.OK("发布版本：" + publishVersion + " 成功！"); } else { diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java index d5f9c7ccb..3d9873de7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoPublishEOService.java @@ -61,7 +61,7 @@ public interface IParamsInfoPublishEOService extends IService getListByPublishVersion(String paramsTemplateId, int publishVersion); - int publishTemplate(String paramsTemplateId); + int publishTemplate(String paramsTemplateId, String cut); Integer getNewestVersionByParamsTemplateId(String paramsTemplateId); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java index a0def11b1..127c75c2a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.cert.template.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.modules.cert.template.entity.*; @@ -120,11 +121,15 @@ public class ParamsInfoPublishEOServiceImpl extends ServiceImpl sourceParamsInfoEOList = paramsInfoEOService.selectListByParamsTemplateIds(paramsTemplateId); if (CollectionUtil.isEmpty(sourceParamsInfoEOList)) { - throw new JeroBootException("没有可发布的参数项！"); // 模板中没有参数项，不让发布 + if (CutEnum.EN.getValue().equals(cut)) { + throw new JeroBootException("Please add parameters before publish!"); // 模板中没有参数项，不让发布 + } else { + throw new JeroBootException("请添加参数后再发布！"); // 模板中没有参数项，不让发布 + } } List sourceCertCategoryParamsInfoEOList = certCategoryParamsInfoEOService.selectListByParamsTemplateIds(paramsTemplateId);