Commit 9405e012 authored by 吴泽佳's avatar 吴泽佳

增加level 取值

parent a27f8807
...@@ -309,11 +309,13 @@ public class OrgSyncByWxcpJob { ...@@ -309,11 +309,13 @@ public class OrgSyncByWxcpJob {
//更新 //更新
Long parentId1 = wxCpDepartDto.getParentId(); Long parentId1 = wxCpDepartDto.getParentId();
String parentId = ObjectUtil.isNull(hashMap2.get(parentId1)) ? null :orgId + "_" + parentId1; // ObjectUtil.isNull(hashMap2.get(parentId1)) String parentId = ObjectUtil.isNull(hashMap2.get(parentId1)) ? null :orgId + "_" + parentId1; // ObjectUtil.isNull(hashMap2.get(parentId1))
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())) { || !department.getMembers().equals(wxCpDepartDto.getMembers()) || level != department.getLevel()) {
department.setDepartmentName(wxCpDepartDto.getName()); department.setDepartmentName(wxCpDepartDto.getName());
department.setParentDepartId(parentId); department.setParentDepartId(parentId);
department.setMembers(wxCpDepartDto.getMembers()); department.setMembers(wxCpDepartDto.getMembers());
department.setLevel(level);
updateList.add(department); updateList.add(department);
} }
hashMap.remove(departmentId); hashMap.remove(departmentId);
......
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