From 7b13ecca55810258539edf78df685fcb1ea58c7f Mon Sep 17 00:00:00 2001
From: yuxueliang0813 <407010292@qq.com>
Date: Thu, 22 May 2025 13:44:59 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8E=A8=E9=80=81=E7=94=A8=E5=8F=8Bb?=
 =?UTF-8?q?ip=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF=E6=B5=8B=E8=AF=95=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E4=B8=8D=E6=8E=A8=E9=80=81=20=202=E3=80=81?=
 =?UTF-8?q?=E9=87=91=E8=9D=B6=E4=BA=BA=E5=91=98=E4=B8=8EOA=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E7=BB=91=E5=AE=9A=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E8=81=8C=E5=91=98=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recon/opplugin/YongyouBIPOperation.java   | 23 +++++++++++++++++--
 .../repc/task/DobePersonOARealtionTask.java   |  4 +++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/main/java/shkd/repc/recon/opplugin/YongyouBIPOperation.java b/main/java/shkd/repc/recon/opplugin/YongyouBIPOperation.java
index 967c60f..1341735 100644
--- a/main/java/shkd/repc/recon/opplugin/YongyouBIPOperation.java
+++ b/main/java/shkd/repc/recon/opplugin/YongyouBIPOperation.java
@@ -139,9 +139,14 @@ public class YongyouBIPOperation extends AbstractOperationServicePlugIn implemen
         //audit审核 syncbip手动同步 两种情况进入如下代码
         String eok = e.getOperationKey();
         if("audit".equals(eok) || "syncbip".equals(eok)){
+            String accountId = RequestContext.get().getAccountId();//获取账套ID
+            //如果是测试环境的路径就不触发推送bip
+            if("2008012388581769216".equals(accountId)){
+                return;
+            }
             String contextUrl = System.getProperty("domain.contextUrl");
             //如果是测试环境的路径就不触发推送bip
-            if(contextUrl != null && contextUrl.startsWith("http://isctest")){
+            if(contextUrl != null && contextUrl.startsWith("https://isctest")){
                 return;
             }
 
@@ -267,6 +272,16 @@ public class YongyouBIPOperation extends AbstractOperationServicePlugIn implemen
         return null;
     }
 
+    private String getOASuppNum(long supplierid){
+        //resm_supplier_f7 表名 t_resm_supplier
+        //resm_official_supplier 表名 t_resm_supplier
+        DynamicObject supinfo = BusinessDataServiceHelper.loadSingle(supplierid,"resm_official_supplier","id,number,qeug_oacode");
+        if(supinfo != null){
+            return supinfo.getString("qeug_oacode");
+        }
+        return null;
+    }
+
     private JSONObject zzPayData(String eventName, DynamicObject payrequestinfo, boolean isnotext){
         String[] companyDept = DobeDWUtils.getCompanyDeptNumber(payrequestinfo.getDynamicObject("usedepart").getString("number"));
         if(companyDept[0] == null){
@@ -300,7 +315,11 @@ public class YongyouBIPOperation extends AbstractOperationServicePlugIn implemen
             supplierNum = payrequestinfo.getDynamicObject("multypereceiveunit").getString("number");
             supplierid = payrequestinfo.getDynamicObject("multypereceiveunit").getLong("id");
         }
-
+//        String suppOANum = getOASuppNum(supplierid);
+//        if(!DobeDWUtils.isEmpty(suppOANum)){
+//            //如果供应商的OA编号不为空，则传递给bip时，用此编号，而不用供应商的编号
+//            supplierNum = suppOANum;
+//        }
         payData.put("customer",supplierNum);//客户编码 即使是供应商也传入到该字段
         payData.put("pk_dept",companyDept[1]);//部门编码（通过公司主体明细表找部门编码）
 
diff --git a/main/java/shkd/repc/task/DobePersonOARealtionTask.java b/main/java/shkd/repc/task/DobePersonOARealtionTask.java
index f5dffd5..1ccbf63 100644
--- a/main/java/shkd/repc/task/DobePersonOARealtionTask.java
+++ b/main/java/shkd/repc/task/DobePersonOARealtionTask.java
@@ -35,9 +35,11 @@ public class DobePersonOARealtionTask extends AbstractTask implements Plugin {
     public void execute(RequestContext requestContext, Map<String, Object> map) throws KDException {
         //查找未绑定成功的人员
         QFilter dwFilter = new QFilter("source", QCP.equals, "dw");//来自数仓
+        QFilter typeFilter = new QFilter("usertype", QCP.equals, "1");//usertype 人员类型 1-职员 3-供应商
         QFilter flagFilter = new QFilter("qeug_flag", QCP.equals, "0");//未与OA绑定
         QFilter enableFilter = new QFilter("enable", QCP.equals, "1");//用户未禁用
-        DynamicObject[] dos = BusinessDataServiceHelper.load(entityName,"id,number,name",new QFilter[]{dwFilter,enableFilter,flagFilter});
+        DynamicObject[] dos = BusinessDataServiceHelper.load(entityName,"id,number,name",
+                new QFilter[]{enableFilter.and(flagFilter).and(dwFilter.or(typeFilter))});
         if(dos.length > 0){
             logger.info("本次需要绑定用户个数"+dos.length);
             DynamicObject userinfo;