diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillPlugin.java
index 8b57ccd..11576a7 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillPlugin.java
@@ -51,8 +51,11 @@ public class MaterialOutBillPlugin extends AbstractBillPlugIn implements BeforeF
     public void afterCreateNewData(EventObject e) {
         super.afterCreateNewData(e);
         long currentUserId = UserServiceHelper.getCurrentUserId();//获取当前用户id
-        long mainOrgID = UserServiceHelper.getUserMainOrgId(currentUserId);//获取用户默认部门id
-        this.getModel().setValue("zcgj_applidepart", mainOrgID);//申请人部门
+//        long mainOrgID = UserServiceHelper.getUserMainOrgId(currentUserId);//获取用户默认部门id
+        List<Long> ids = UserServiceHelper.getOrgsUserJoin(currentUserId);
+        if (ids != null && ids.size() == 1) {
+            this.getModel().setValue("zcgj_applidepart", ids.get(0));//申请人部门
+        }
     }
 
     @Override
@@ -74,7 +77,7 @@ public class MaterialOutBillPlugin extends AbstractBillPlugIn implements BeforeF
             if (newValue != null) {
                 DynamicObject warehouse = (DynamicObject) newValue;
                 this.getModel().setValue("zcgj_fiorg", warehouse.get("org"));//核算组织
-            }else {
+            } else {
                 this.getModel().setValue("zcgj_fiorg", null);//清空核算组织字段
                 this.getModel().setValue("project", null);//清空项目字段
             }
@@ -124,8 +127,12 @@ public class MaterialOutBillPlugin extends AbstractBillPlugIn implements BeforeF
                 return;
             }
             DynamicObject zcgj_outbound_by = (DynamicObject) newValue;//出库申请人
-            long mainOrgID = UserServiceHelper.getUserMainOrgId((Long) zcgj_outbound_by.getPkValue());//获取用户默认部门id
-            this.getModel().setValue("zcgj_applidepart", mainOrgID);//申请人部门
+            List<Long> ids = UserServiceHelper.getOrgsUserJoin((Long) zcgj_outbound_by.getPkValue());
+            if (ids != null && ids.size() == 1) {
+                this.getModel().setValue("zcgj_applidepart", ids.get(0));//申请人部门
+            } else {
+                this.getModel().setValue("zcgj_applidepart", null);//清空申请人部门字段
+            }
         }
     }
 
diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialOutBillOpExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialOutBillOpExt.java
index b85d55b..b46ce59 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialOutBillOpExt.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialOutBillOpExt.java
@@ -252,7 +252,7 @@ public class MaterialOutBillOpExt extends AbstractOperationServicePlugIn {
                     }
 
                     if (StringUtils.equals(costType, "b") && contract == null) {
-                        throw new KDBizException(String.format(ResManager.loadKDString("%s：请填写“合同编号”。", "MaterialOutBillOp_2", "ec-ecma-opplugin", new Object[0]), billNumber));
+//                        throw new KDBizException(String.format(ResManager.loadKDString("%s：请填写“合同编号”。", "MaterialOutBillOp_2", "ec-ecma-opplugin", new Object[0]), billNumber));
                     }
 
                     DynamicObject requestPersonF7 = obj.getDynamicObject("requestperson");