diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/form/ClaimBillButtonAssPlugin.java b/main/java/shjh/jhzj7/fi/fi/plugin/form/ClaimBillButtonAssPlugin.java
index 2218714..18ceee3 100644
--- a/main/java/shjh/jhzj7/fi/fi/plugin/form/ClaimBillButtonAssPlugin.java
+++ b/main/java/shjh/jhzj7/fi/fi/plugin/form/ClaimBillButtonAssPlugin.java
@@ -17,6 +17,8 @@ import kd.bos.logging.LogFactory;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
+import kd.bos.servicehelper.QueryServiceHelper;
+import kd.bos.servicehelper.user.UserServiceHelper;
 import kd.sdk.plugin.Plugin;
 import shjh.jhzj7.fi.fi.plugin.form.info.ClaimFieldsInfo;
 import shjh.jhzj7.fi.fi.utils.EsbUtils;
@@ -177,6 +179,22 @@ public class ClaimBillButtonAssPlugin extends AbstractFormPlugin implements Plug
         this.getModel().setValue(ClaimFieldsInfo.PAYMENT_AMOUNT, returnData.get(i).getBigDecimal(ClaimFieldsInfo.PAYMENT_AMOUNT), i);
         //单据可退还金额
         this.getModel().setValue(ClaimFieldsInfo.DOCUMENT_AMOUNT, returnData.get(i).getBigDecimal(ClaimFieldsInfo.DOCUMENT_AMOUNT), i);
+        //员工编码
+        String userNum=returnData.get(i).getString(ClaimFieldsInfo.USER_CODE);
+        String deptNum = returnData.get(i).getString(ClaimFieldsInfo.DEPT_CODE);
+        long currUserId = RequestContext.get().getCurrUserId();
+        DynamicObject user = BusinessDataServiceHelper.loadSingle(currUserId, "bos_user");
+        if (user!=null){
+            userNum=user.getString("number");
+        }
+        this.getModel().setValue(ClaimFieldsInfo.USER_CODE,userNum , i);
+        //部门编码
+        DynamicObjectCollection numbers = UserServiceHelper.getCurrentUserDepts("number", true);
+        if (numbers.size()!=0){
+            deptNum=numbers.get(0).getString("number");
+        }
+        this.getModel().setValue(ClaimFieldsInfo.DEPT_CODE, deptNum, i);
+
         //标品的应收金额字段和二开的本次退还本位币金额，默认设置为可用金额 暂时不用同单据可退还金额一致 0528
 //        this.getModel().setValue(ClaimFieldsInfo.REFUNDED_AMOUNT, returnData.get(i).getBigDecimal(ClaimFieldsInfo.DOCUMENT_AMOUNT), i);
 //        this.getModel().setValue("amountfield3", returnData.get(i).getBigDecimal(ClaimFieldsInfo.DOCUMENT_AMOUNT), i);
@@ -194,6 +212,10 @@ public class ClaimBillButtonAssPlugin extends AbstractFormPlugin implements Plug
         this.getModel().setValue(ClaimFieldsInfo.LOAN_AMOUNT, returnData.get(i).getBigDecimal(ClaimFieldsInfo.LOAN_AMOUNT), i);
         //借款余额
         this.getModel().setValue(ClaimFieldsInfo.LOAN_BALANCE, returnData.get(i).getBigDecimal(ClaimFieldsInfo.LOAN_BALANCE), i);
+        //员工编码
+        this.getModel().setValue(ClaimFieldsInfo.USER_CODE, returnData.get(i).getString(ClaimFieldsInfo.USER_CODE), i);
+        //部门编码
+        this.getModel().setValue(ClaimFieldsInfo.DEPT_CODE, returnData.get(i).getString(ClaimFieldsInfo.DEPT_CODE), i);
         //标品的实收金额和二开的本次还款金额，默认设置为借款余额 暂时不用同余额一致 0528
 //        this.getModel().setValue(ClaimFieldsInfo.REPAYMENT_AMOUNT, returnData.get(i).getBigDecimal(ClaimFieldsInfo.LOAN_BALANCE), i);
 //        this.getModel().setValue("amountfield3", returnData.get(i).getBigDecimal(ClaimFieldsInfo.LOAN_BALANCE), i);
@@ -213,10 +235,6 @@ public class ClaimBillButtonAssPlugin extends AbstractFormPlugin implements Plug
         this.getModel().setValue(ClaimFieldsInfo.HEADER_ID, returnData.get(i).getString(ClaimFieldsInfo.HEADER_ID), i);
         //关联分录id
         this.getModel().setValue(ClaimFieldsInfo.DETAIL_ID, returnData.get(i).getString(ClaimFieldsInfo.DETAIL_ID), i);
-        //员工编码
-        this.getModel().setValue(ClaimFieldsInfo.USER_CODE, returnData.get(i).getString(ClaimFieldsInfo.USER_CODE), i);
-        //部门编码
-        this.getModel().setValue(ClaimFieldsInfo.DEPT_CODE, returnData.get(i).getString(ClaimFieldsInfo.DEPT_CODE), i);
 
         //过账日期
         this.getModel().setValue("shjh_postingdate", returnData.get(i).getDate("shjh_postingdate"), i);