Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in
Toggle navigation
F
feo-jobs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
探普后端
feo-jobs
Commits
6b3e04a1
Commit
6b3e04a1
authored
Nov 25, 2021
by
钱坤
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
同步组织架构时候,若父部门不可见,那么将parentId设置为空串
parent
5a481232
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
OrgSyncByWxcpJob.java
...main/java/com/tanpu/feo/feojob/jobs/OrgSyncByWxcpJob.java
+2
-2
No files found.
src/main/java/com/tanpu/feo/feojob/jobs/OrgSyncByWxcpJob.java
View file @
6b3e04a1
...
@@ -312,7 +312,7 @@ public class OrgSyncByWxcpJob {
...
@@ -312,7 +312,7 @@ public class OrgSyncByWxcpJob {
}
}
//更新
//更新
Long
parentId1
=
wxCpDepartDto
.
getParentId
();
Long
parentId1
=
wxCpDepartDto
.
getParentId
();
String
parentId
=
ObjectUtil
.
isNull
(
hashMap2
.
get
(
parentId1
))
?
null
:
orgId
+
"_"
+
parentId1
;
String
parentId
=
ObjectUtil
.
isNull
(
hashMap2
.
get
(
parentId1
))
?
""
:
orgId
+
"_"
+
parentId1
;
Integer
level
=
getLevel
(
hashMap2
,
wxCpDepartDto
.
getId
());
Integer
level
=
getLevel
(
hashMap2
,
wxCpDepartDto
.
getId
());
if
(!
department
.
getDepartmentName
().
equals
(
wxCpDepartDto
.
getName
())
||
StrUtil
.
compareIgnoreCase
(
department
.
getParentDepartId
(),
parentId
,
false
)
!=
0
if
(!
department
.
getDepartmentName
().
equals
(
wxCpDepartDto
.
getName
())
||
StrUtil
.
compareIgnoreCase
(
department
.
getParentDepartId
(),
parentId
,
false
)
!=
0
||
!
department
.
getMembers
().
equals
(
wxCpDepartDto
.
getMembers
())
||
!
level
.
equals
(
department
.
getLevel
()))
{
||
!
department
.
getMembers
().
equals
(
wxCpDepartDto
.
getMembers
())
||
!
level
.
equals
(
department
.
getLevel
()))
{
...
@@ -328,7 +328,7 @@ public class OrgSyncByWxcpJob {
...
@@ -328,7 +328,7 @@ public class OrgSyncByWxcpJob {
for
(
String
departmentId
:
hashMap
.
keySet
())
{
for
(
String
departmentId
:
hashMap
.
keySet
())
{
WxCpDepartDto
wxCpDepartDto
=
hashMap
.
get
(
departmentId
);
WxCpDepartDto
wxCpDepartDto
=
hashMap
.
get
(
departmentId
);
Long
parentId1
=
wxCpDepartDto
.
getParentId
();
Long
parentId1
=
wxCpDepartDto
.
getParentId
();
String
parentId
=
ObjectUtil
.
isNull
(
hashMap2
.
get
(
parentId1
))
?
null
:
orgId
+
"_"
+
parentId1
;
String
parentId
=
ObjectUtil
.
isNull
(
hashMap2
.
get
(
parentId1
))
?
""
:
orgId
+
"_"
+
parentId1
;
DepartmentEntity
department
=
new
DepartmentEntity
();
DepartmentEntity
department
=
new
DepartmentEntity
();
department
.
setDepartmentId
(
orgId
+
"_"
+
wxCpDepartDto
.
getId
());
department
.
setDepartmentId
(
orgId
+
"_"
+
wxCpDepartDto
.
getId
());
department
.
setParentDepartId
(
parentId
);
department
.
setParentDepartId
(
parentId
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment