From f49b4aef156a926ae915c78777b955fc9f701c7a Mon Sep 17 00:00:00 2001 From: "SGK\\17962" <1796293269@qq.com> Date: Thu, 18 Sep 2025 17:17:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cds-fontend-2025.V1/src/views/mps/market/index.vue | 6 +++--- .../org/dromara/mps/service/impl/MpsMarketServiceImpl.java | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cds-fontend-2025.V1/src/views/mps/market/index.vue b/cds-fontend-2025.V1/src/views/mps/market/index.vue index 6424d43..d2c5a4e 100644 --- a/cds-fontend-2025.V1/src/views/mps/market/index.vue +++ b/cds-fontend-2025.V1/src/views/mps/market/index.vue @@ -418,9 +418,9 @@ const { }; // 只有当checkType为'9'时才显示编辑和删除按钮 - // if (row.checkFlag !== '9') { - // return null; - // } + if (row.checkFlag !== '9') { + return null; + } return (
{editBtn()} diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java index 13a89b2..cdf52f1 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.idev.excel.util.DateUtils; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; +import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.exception.ServiceException; @@ -609,6 +610,9 @@ public class MpsMarketServiceImpl implements IMpsMarketService { List trafficIds = new ArrayList<>(); for (MpsMarket market : marketList) { + if(!"9".equals(market.getCheckFlag())){//9-校验失败 + throw new ServiceException("校验状态异常，不允许删除！"); + } if (market.getMagneticCardId() != null) { magneticCardIds.add(market.getMagneticCardId()); }