Commit 6b3e04a1 authored by 钱坤's avatar 钱坤

同步组织架构时候,若父部门不可见,那么将parentId设置为空串

parent 5a481232
...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment