From d2c0bccd2e6dde4cf2a614a67bbf0ed45e2bcbaf Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 29 十一月 2024 13:59:22 +0800
Subject: [PATCH] # 213

---
 src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
index 44b7c7e..c9294b6 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
@@ -204,8 +204,9 @@
                     statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
                 }
             case 3://鍏宠繘鏂欓棬浠诲姟  //鐢熸垚鍒濆浠诲姟
-                statusList.add(4);//鍏ョ~鍖栫綈瀹屾垚
-
+                if (type!=6){
+                    statusList.add(4);//鍏ョ~鍖栫綈瀹屾垚
+                }
             case 2://鍏宠繘鏂欓棬浠诲姟  //鐢熸垚鍒濆浠诲姟
                 statusList.add(0);//鍒濆
 
@@ -216,7 +217,7 @@
                 statusList.add(1);//寮�杩涙枡闂ㄤ腑
                 statusList.add(3);//鍏ョ~鍖栫綈涓�
 
-                if (type!=6){
+                if (type!=6 && type!=3){
                     statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
                 }
                 if (type!=5  && type!=6){

--
Gitblit v1.9.1