Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
此号慢热型
o2oa
提交
0c409bf1
o2oa
项目概览
此号慢热型
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0c409bf1
编写于
2月 19, 2019
作者:
R
roo00
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
bug fix 钉钉政务钉钉同步失败
上级
aa89a2b6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
6 deletion
+10
-6
o2server/x_program_center/src/main/java/com/x/program/center/dingding/SyncOrganization.java
.../java/com/x/program/center/dingding/SyncOrganization.java
+1
-1
o2server/x_program_center/src/main/java/com/x/program/center/zhengwudingding/SyncOrganization.java
...om/x/program/center/zhengwudingding/SyncOrganization.java
+9
-5
未找到文件。
o2server/x_program_center/src/main/java/com/x/program/center/dingding/SyncOrganization.java
浏览文件 @
0c409bf1
...
...
@@ -442,7 +442,7 @@ public class SyncOrganization {
/* 删除身份 */
for
(
Identity
identity
:
ListUtils
.
subtract
(
allIdentities
,
identities
))
{
Person
person
=
emc
.
find
(
identity
.
getPerson
(),
Person
.
class
);
if
(
null
==
person
||
StringUtils
.
isNotEmpty
(
person
.
get
Qiyeweixin
Id
()))
{
if
(
null
==
person
||
StringUtils
.
isNotEmpty
(
person
.
get
Dingding
Id
()))
{
List
<
UnitDuty
>
uds
=
emc
.
listIsMember
(
UnitDuty
.
class
,
UnitDuty
.
identityList_FIELDNAME
,
identity
.
getId
());
if
(
ListTools
.
isNotEmpty
(
uds
))
{
...
...
o2server/x_program_center/src/main/java/com/x/program/center/zhengwudingding/SyncOrganization.java
浏览文件 @
0c409bf1
...
...
@@ -205,21 +205,24 @@ public class SyncOrganization {
logger
.
print
(
"正在删除单个组织{}."
,
unit
.
getDistinguishedName
());
EntityManagerContainer
emc
=
business
.
entityManagerContainer
();
emc
.
beginTransaction
(
UnitAttribute
.
class
);
emc
.
beginTransaction
(
UnitDuty
.
class
);
emc
.
beginTransaction
(
Identity
.
class
);
emc
.
beginTransaction
(
Unit
.
class
);
for
(
UnitAttribute
o
:
emc
.
listEqual
(
UnitAttribute
.
class
,
UnitAttribute
.
unit_FIELDNAME
,
unit
.
getId
()))
{
emc
.
remove
(
o
,
CheckRemoveType
.
all
);
result
.
getRemoveUnitAttributeList
().
add
(
o
.
getDistinguishedName
());
}
emc
.
commit
();
emc
.
beginTransaction
(
UnitDuty
.
class
);
for
(
UnitDuty
o
:
emc
.
listEqual
(
UnitDuty
.
class
,
UnitDuty
.
unit_FIELDNAME
,
unit
.
getId
()))
{
emc
.
remove
(
o
,
CheckRemoveType
.
all
);
result
.
getRemoveUnitDutyList
().
add
(
o
.
getDistinguishedName
());
}
emc
.
commit
();
emc
.
beginTransaction
(
Identity
.
class
);
for
(
Identity
o
:
emc
.
listEqual
(
Identity
.
class
,
Identity
.
unit_FIELDNAME
,
unit
.
getId
()))
{
emc
.
remove
(
o
,
CheckRemoveType
.
all
);
result
.
getRemoveIdentityList
().
add
(
o
.
getDistinguishedName
());
}
emc
.
commit
();
emc
.
beginTransaction
(
Unit
.
class
);
emc
.
remove
(
unit
,
CheckRemoveType
.
all
);
emc
.
commit
();
result
.
getRemoveUnitList
().
add
(
unit
.
getDistinguishedName
());
...
...
@@ -352,13 +355,14 @@ public class SyncOrganization {
private
void
removePerson
(
Business
business
,
PullResult
result
,
Person
person
)
throws
Exception
{
EntityManagerContainer
emc
=
business
.
entityManagerContainer
();
emc
.
beginTransaction
(
Person
.
class
);
emc
.
beginTransaction
(
PersonAttribute
.
class
);
for
(
PersonAttribute
o
:
emc
.
listEqual
(
PersonAttribute
.
class
,
PersonAttribute
.
person_FIELDNAME
,
person
.
getId
()))
{
result
.
getRemovePersonAttributeList
().
add
(
o
.
getDistinguishedName
());
emc
.
remove
(
o
,
CheckRemoveType
.
all
);
}
emc
.
commit
();
emc
.
beginTransaction
(
Person
.
class
);
emc
.
remove
(
person
,
CheckRemoveType
.
all
);
emc
.
commit
();
result
.
getRemovePersonList
().
add
(
person
.
getDistinguishedName
());
...
...
@@ -438,7 +442,7 @@ public class SyncOrganization {
/* 删除身份 */
for
(
Identity
identity
:
ListUtils
.
subtract
(
allIdentities
,
identities
))
{
Person
person
=
emc
.
find
(
identity
.
getPerson
(),
Person
.
class
);
if
(
null
==
person
||
StringUtils
.
isNotEmpty
(
person
.
get
Qiyeweixin
Id
()))
{
if
(
null
==
person
||
StringUtils
.
isNotEmpty
(
person
.
get
ZhengwuDingding
Id
()))
{
List
<
UnitDuty
>
uds
=
emc
.
listIsMember
(
UnitDuty
.
class
,
UnitDuty
.
identityList_FIELDNAME
,
identity
.
getId
());
if
(
ListTools
.
isNotEmpty
(
uds
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录