From 17dad5b99ddbe736deae3a3a5662a19fb71773d0 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Thu, 20 Jun 2024 17:49:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E4=BB=A4=E5=AE=8C=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../acs/instruction/service/impl/InstructionServiceImpl.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index 71c21c0..02901eb 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -758,7 +758,10 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
     @Transactional(rollbackFor = Exception.class)
     public void finish(String id) {
         InstructionDto entity = this.findById(id);
-        // if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
+         if (ObjectUtil.isEmpty(entity)||"3".equals(entity.getInstruction_status())) {
+             log.error("指令{}被删除或无权限，操作失败!",id);
+             return;
+         }
         String currentUsername = SecurityUtils.getCurrentUsername();
         String now = DateUtil.now();
         entity.setUpdate_time(now);