diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
index 80cb8c795..6a3a299db 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
@@ -604,17 +604,22 @@ public class StockInOrderApplicationService {
         }
         String[] split = taskIssueUserId.split(",");
         List<String> taskIds = Arrays.asList(split);
-        // 删除匹配元素
-        taskIds.removeIf(str -> removeUserId.equals(str));
         if (taskIds != null && taskIds.size() > 0) {
-            String newTaskIssueUserId = String.join(",", taskIds);
-            stock.setTaskIssueUserId(newTaskIssueUserId);
-            stockInOrderService.updateById(stock);
+            // 删除匹配元素
+            taskIds.removeIf(str -> removeUserId.equals(str));
+            if (taskIds != null && taskIds.size() > 0) {
+                String newTaskIssueUserId = String.join(",", taskIds);
+                stock.setTaskIssueUserId(newTaskIssueUserId);
+                stockInOrderService.updateById(stock);
+            } else {
+                stockInOrderService.update(null ,new LambdaUpdateWrapper<StockInOrder>()
+                        .set(StockInOrder::getTaskIssueUserId, null)
+                        .eq(StockInOrder::getInOrderId, stockInOrder.getInOrderId()));
+            }
         } else {
-            stockInOrderService.update(null ,new LambdaUpdateWrapper<StockInOrder>()
-                    .set(StockInOrder::getTaskIssueUserId, null)
-                    .eq(StockInOrder::getInOrderId, stockInOrder.getInOrderId()));
+            throw new ServiceException("当前订单没有任务人员!");
         }
+
     }
 
     public void omsOrderAddDetail(List<InMaterialDetail> inMaterialDetails){
diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
index dd5583a13..a8ecf9aa8 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
@@ -1651,17 +1651,22 @@ public class StockOutOrderApplicationService {
         }
         String[] split = taskIssueUserId.split(",");
         List<String> taskIds = Arrays.asList(split);
-        // 删除匹配元素
-        taskIds.removeIf(str -> removeUserId.equals(str));
         if (taskIds != null && taskIds.size() > 0) {
-            String newTaskIssueUserId = String.join(",", taskIds);
-            stock.setTaskIssueUserId(newTaskIssueUserId);
-            stockOutOrderService.updateById(stock);
+            // 删除匹配元素
+            taskIds.removeIf(str -> removeUserId.equals(str));
+            if (taskIds != null && taskIds.size() > 0) {
+                String newTaskIssueUserId = String.join(",", taskIds);
+                stock.setTaskIssueUserId(newTaskIssueUserId);
+                stockOutOrderService.updateById(stock);
+            } else {
+                stockOutOrderService.update(null ,new LambdaUpdateWrapper<StockOutOrder>()
+                        .set(StockOutOrder::getTaskIssueUserId, null)
+                        .eq(StockOutOrder::getOutOrderId, stockOutOrder.getOutOrderId()));
+            }
         } else {
-            stockOutOrderService.update(null ,new LambdaUpdateWrapper<StockOutOrder>()
-                    .set(StockOutOrder::getTaskIssueUserId, null)
-                    .eq(StockOutOrder::getOutOrderId, stockOutOrder.getOutOrderId()));
+            throw new ServiceException("当前订单不存在任务人员!");
         }
+
     }