1、推送用友bip测试接口域名判断改为包含 2、人员更新接口中如果是离职后再入职,直接启用
This commit is contained in:
parent
84f6db828d
commit
ec549fcb7c
|
@ -132,7 +132,7 @@ public class DobeDWpersonUpdateTask extends AbstractTask implements Plugin {
|
||||||
log.info(String.format("人员入参为空异常:%s", json_body.toJSONString()));
|
log.info(String.format("人员入参为空异常:%s", json_body.toJSONString()));
|
||||||
continue;
|
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){
|
if(currentUser != null){
|
||||||
user = new UserParam();//常用或者重要的参数,详情请查看参数对象UserParam
|
user = new UserParam();//常用或者重要的参数,详情请查看参数对象UserParam
|
||||||
dataMap = new HashMap<>();
|
dataMap = new HashMap<>();
|
||||||
|
@ -147,6 +147,12 @@ public class DobeDWpersonUpdateTask extends AbstractTask implements Plugin {
|
||||||
if(personoabid){
|
if(personoabid){
|
||||||
userinfos.add(currentUser);
|
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)){
|
if(!DobeDWUtils.isEmpty(deptid)){
|
||||||
deptOrg = QueryServiceHelper.queryOne("bos_org","id,number,name",new QFilter[]{new QFilter("fyzjorgid","=",deptid)});
|
deptOrg = QueryServiceHelper.queryOne("bos_org","id,number,name",new QFilter[]{new QFilter("fyzjorgid","=",deptid)});
|
||||||
|
|
|
@ -91,9 +91,14 @@ public class YongyouBIPOperation extends AbstractOperationServicePlugIn implemen
|
||||||
//反审核之前,调用bip接口,如果接口成功则更改标记后继续反审核业务
|
//反审核之前,调用bip接口,如果接口成功则更改标记后继续反审核业务
|
||||||
String eok = e.getOperationKey();
|
String eok = e.getOperationKey();
|
||||||
if("unaudit".equals(eok)){
|
if("unaudit".equals(eok)){
|
||||||
|
String accountId = RequestContext.get().getAccountId();//获取账套ID
|
||||||
|
//如果是测试环境的路径就不触发推送bip
|
||||||
|
if("2008012388581769216".equals(accountId)){
|
||||||
|
return;
|
||||||
|
}
|
||||||
String contextUrl = System.getProperty("domain.contextUrl");
|
String contextUrl = System.getProperty("domain.contextUrl");
|
||||||
//如果是测试环境的路径就不触发推送bip
|
//如果是测试环境的路径就不触发推送bip
|
||||||
if(contextUrl != null && contextUrl.startsWith("http://isctest")){
|
if(contextUrl != null && contextUrl.contains("isctest")){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
DynamicObject[] dos = e.getDataEntities();
|
DynamicObject[] dos = e.getDataEntities();
|
||||||
|
@ -146,7 +151,7 @@ public class YongyouBIPOperation extends AbstractOperationServicePlugIn implemen
|
||||||
}
|
}
|
||||||
String contextUrl = System.getProperty("domain.contextUrl");
|
String contextUrl = System.getProperty("domain.contextUrl");
|
||||||
//如果是测试环境的路径就不触发推送bip
|
//如果是测试环境的路径就不触发推送bip
|
||||||
if(contextUrl != null && contextUrl.startsWith("https://isctest")){
|
if(contextUrl != null && contextUrl.contains("isctest")){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue