diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/MakeReturnOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/MakeReturnOrderServiceImpl.java
index 86688f67..43be8242 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/MakeReturnOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/MakeReturnOrderServiceImpl.java
@@ -270,9 +270,9 @@ public class MakeReturnOrderServiceImpl implements IMakeReturnOrderService
         // 角色不同审核人不同
         if(roleKeys.contains("scyRole")){
             variables.put("authority",1);
-        }else if(roleKeys.contains("scjlRole")){
+        }else if(roleKeys.contains("sczgRole")){
             variables.put("authority",2);
-        }else if(roleKeys.contains("sczgRole")||roleKeys.contains("admin")){
+        }else if(roleKeys.contains("scjlRole")||roleKeys.contains("admin")){
             variables.put("authority",3);
         }
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickDetailServiceImpl.java
index a3226e44..68c16303 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickDetailServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickDetailServiceImpl.java
@@ -199,12 +199,14 @@ public class SysMakeorderPickDetailServiceImpl implements ISysMakeorderPickDetai
                         .sum();
                 pickDetail.setHasReturnNum(returnNum);
             }
-            WarehouseOutOrderDetail tempDetail = new WarehouseOutOrderDetail();
-            tempDetail.setOutOrderCode(outOrderCode);
-            tempDetail.setMaterialNo(pickDetail.getMaterialNo());
-            WarehouseOutOrderDetail outOrderDetail = outOrderDetailMapper.selectOutOrderDetailListByThreeCode(tempDetail);
-            int outNum = Optional.ofNullable(outOrderDetail.getHasOutOrderSum()).orElse(0);
-            pickDetail.setHasPickNum(outNum);
+            if(outOrderCode!=null){
+                WarehouseOutOrderDetail tempDetail = new WarehouseOutOrderDetail();
+                tempDetail.setOutOrderCode(outOrderCode);
+                tempDetail.setMaterialNo(pickDetail.getMaterialNo());
+                WarehouseOutOrderDetail outOrderDetail = outOrderDetailMapper.selectOutOrderDetailListByThreeCode(tempDetail);
+                int outNum = Optional.ofNullable(outOrderDetail.getHasOutOrderSum()).orElse(0);
+                pickDetail.setHasPickNum(outNum);
+            }
         }
         return mergedDetails;
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java
index be46a443..08ff5e06 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java
@@ -423,9 +423,9 @@ public class SysMakeorderPickServiceImpl implements ISysMakeorderPickService
         // 角色不同审核人不同
         if(roleKeys.contains("scyRole")){
             variables.put("authority",1);
-        }else if(roleKeys.contains("scjlRole")){
+        }else if(roleKeys.contains("sczgRole")){
             variables.put("authority",2);
-        }else if(roleKeys.contains("sczgRole")||roleKeys.contains("admin")){
+        }else if(roleKeys.contains("scjlRole")||roleKeys.contains("admin")){
             variables.put("authority",3);
         }
     }