From ec549fcb7ccb686bb0fe1826ff7de3db403bdc05 Mon Sep 17 00:00:00 2001 From: yuxueliang0813 <407010292@qq.com> Date: Sun, 1 Jun 2025 22:26:19 +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=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=94=B9=E4=B8=BA=E5=8C=85=E5=90=AB=202?= =?UTF-8?q?=E3=80=81=E4=BA=BA=E5=91=98=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=B8=AD=E5=A6=82=E6=9E=9C=E6=98=AF=E7=A6=BB=E8=81=8C=E5=90=8E?= =?UTF-8?q?=E5=86=8D=E5=85=A5=E8=81=8C=EF=BC=8C=E7=9B=B4=E6=8E=A5=E5=90=AF?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/shkd/bamp/base/task/DobeDWpersonUpdateTask.java | 8 +++++++- .../shkd/repc/recon/opplugin/YongyouBIPOperation.java | 9 +++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/main/java/shkd/bamp/base/task/DobeDWpersonUpdateTask.java b/main/java/shkd/bamp/base/task/DobeDWpersonUpdateTask.java index ab6b0bc..5f051ed 100644 --- a/main/java/shkd/bamp/base/task/DobeDWpersonUpdateTask.java +++ b/main/java/shkd/bamp/base/task/DobeDWpersonUpdateTask.java @@ -132,7 +132,7 @@ public class DobeDWpersonUpdateTask extends AbstractTask implements Plugin { log.info(String.format("人员入参为空异常：%s", json_body.toJSONString())); continue; } - currentUser = QueryServiceHelper.queryOne(entityName,"id,number,name",new QFilter[]{new QFilter("number","=",number)}); + currentUser = QueryServiceHelper.queryOne(entityName,"id,number,name,enable",new QFilter[]{new QFilter("number","=",number)}); if(currentUser != null){ user = new UserParam();//常用或者重要的参数，详情请查看参数对象UserParam dataMap = new HashMap<>(); @@ -147,6 +147,12 @@ public class DobeDWpersonUpdateTask extends AbstractTask implements Plugin { if(personoabid){ userinfos.add(currentUser); } + //判断当前用户是否已被禁用，如果是，则说明离职后再入职，需要更新为启用以及清空OA绑定的标记 + if(!currentUser.getBoolean("enable")){ + dataMap.put("enable", true);//人员禁用-变为启用 + dataMap.put("isforbidden", true);//用户禁用-变为启用 +// dataMap.put("qeug_flag", false);//OA绑定-变为未绑定 + } //处理部门和职位 if(!DobeDWUtils.isEmpty(deptid)){ deptOrg = QueryServiceHelper.queryOne("bos_org","id,number,name",new QFilter[]{new QFilter("fyzjorgid","=",deptid)}); diff --git a/main/java/shkd/repc/recon/opplugin/YongyouBIPOperation.java b/main/java/shkd/repc/recon/opplugin/YongyouBIPOperation.java index 1341735..b41b8b2 100644 --- a/main/java/shkd/repc/recon/opplugin/YongyouBIPOperation.java +++ b/main/java/shkd/repc/recon/opplugin/YongyouBIPOperation.java @@ -91,9 +91,14 @@ public class YongyouBIPOperation extends AbstractOperationServicePlugIn implemen //反审核之前，调用bip接口，如果接口成功则更改标记后继续反审核业务 String eok = e.getOperationKey(); if("unaudit".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.contains("isctest")){ return; } DynamicObject[] dos = e.getDataEntities(); @@ -146,7 +151,7 @@ public class YongyouBIPOperation extends AbstractOperationServicePlugIn implemen } String contextUrl = System.getProperty("domain.contextUrl"); //如果是测试环境的路径就不触发推送bip - if(contextUrl != null && contextUrl.startsWith("https://isctest")){ + if(contextUrl != null && contextUrl.contains("isctest")){ return; }