From 75161406cb9d499d8627b56afe61b2a4144fde49 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 03 八月 2023 14:13:52 +0800
Subject: [PATCH] 更新解锁

---
 src/main/java/com/whyc/service/SoftwareService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/whyc/service/SoftwareService.java b/src/main/java/com/whyc/service/SoftwareService.java
index 497ffb5..5880a2f 100644
--- a/src/main/java/com/whyc/service/SoftwareService.java
+++ b/src/main/java/com/whyc/service/SoftwareService.java
@@ -238,6 +238,7 @@
                 .set("local_reason","杞欢鐗堟湰鍗囩骇")
                 .eq("board_number",boardNumber)
                 .eq("type",type)
+                .ne("lock_flag",-1)
                 .in("apply_material_code",materialCodeList);
         mapper.update(null,update);
     }
@@ -302,7 +303,7 @@
                 //if(!userName.equals("鏉庢鍗�")){
                 //    return new Response().set(1,false,"鏃犳潈闄愯В閿� 寰呮祴璇曠殑杞欢");
                 //}else{
-                    //閿佸畾鍘熸潵鐨勬墍鏈夌増鏈�:鏍规嵁鐗堝彿鍜岃蒋浠剁被鍨�
+                    //閿佸畾鍘熸潵鐨勬墍鏈夌増鏈�:鏍规嵁鐗堝彿鍜岃蒋浠剁被鍨�,鎺掗櫎寰呮祴璇曠増鏈�
                     List<String> materialCodeList = softwareListInDB.stream().map(Software::getApplyMaterialCode).collect(Collectors.toList());
                     lockByBoardNumberAndTypeAndMaterialCode(softwareInDB.getBoardNumber(),softwareInDB.getType(),materialCodeList);
 

--
Gitblit v1.9.1