Commit 8a9f219b authored by 吴泽佳's avatar 吴泽佳

bug修复 员工离职又回来的的问题2

parent 0441be4a
...@@ -160,7 +160,7 @@ public class OrgSyncByWxcpJob { ...@@ -160,7 +160,7 @@ public class OrgSyncByWxcpJob {
List<EmployeeRoleEntity> deleteList = new ArrayList<>(); List<EmployeeRoleEntity> deleteList = new ArrayList<>();
List<EmployeeRoleEntity> updateList = new ArrayList<>(); List<EmployeeRoleEntity> updateList = new ArrayList<>();
//获取 数据库 部门员工关系 信息 //获取 数据库 部门员工关系 信息
List<EmployeeRoleEntity> employeeRoleList = employeeRoleService.findInfoByOrgIdAll(orgId); List<EmployeeRoleEntity> employeeRoleList = employeeRoleService.findInfoByOrgId(orgId);
// 获取 role // 获取 role
Map<String, String> roleMap = roleService.findInfoNoAdmin(); Map<String, String> roleMap = roleService.findInfoNoAdmin();
// 预处理 新数据 // 预处理 新数据
...@@ -223,7 +223,7 @@ public class OrgSyncByWxcpJob { ...@@ -223,7 +223,7 @@ public class OrgSyncByWxcpJob {
List<DepartmentEmployeeEntity> deleteList = new ArrayList<>(); List<DepartmentEmployeeEntity> deleteList = new ArrayList<>();
List<DepartmentEmployeeEntity> updateList = new ArrayList<>(); List<DepartmentEmployeeEntity> updateList = new ArrayList<>();
//获取 数据库 部门员工关系 信息 //获取 数据库 部门员工关系 信息
List<DepartmentEmployeeEntity> departmentEmployeeList = departmentEmployeeService.findInfoByOrgIdAll(orgId); List<DepartmentEmployeeEntity> departmentEmployeeList = departmentEmployeeService.findInfoByOrgId(orgId);
// 预处理 新数据 // 预处理 新数据
HashMap<String, WxCpUser> hashMap = new HashMap<>(); HashMap<String, WxCpUser> hashMap = new HashMap<>();
for (WxCpDepartDto wxCpDepartDto : wxCpDepartDtoList) { for (WxCpDepartDto wxCpDepartDto : wxCpDepartDtoList) {
...@@ -282,7 +282,7 @@ public class OrgSyncByWxcpJob { ...@@ -282,7 +282,7 @@ public class OrgSyncByWxcpJob {
List<DepartmentEntity> deleteList = new ArrayList<>(); List<DepartmentEntity> deleteList = new ArrayList<>();
List<DepartmentEntity> updateList = new ArrayList<>(); List<DepartmentEntity> updateList = new ArrayList<>();
//获取 数据库 部门 信息 //获取 数据库 部门 信息
List<DepartmentEntity> departmentList = departmentService.findDepartmentByOrgIdAll(orgId); List<DepartmentEntity> departmentList = departmentService.findDepartmentByOrgId(orgId);
// 预处理 新数据 // 预处理 新数据
HashMap<String, WxCpDepartDto> hashMap = new HashMap<>(); HashMap<String, WxCpDepartDto> hashMap = new HashMap<>();
HashMap<Long, WxCpDepartDto> hashMap2 = new HashMap<>(); HashMap<Long, WxCpDepartDto> hashMap2 = new HashMap<>();
...@@ -356,7 +356,7 @@ public class OrgSyncByWxcpJob { ...@@ -356,7 +356,7 @@ public class OrgSyncByWxcpJob {
List<EmployeeEntity> deleteList = new ArrayList<>(); List<EmployeeEntity> deleteList = new ArrayList<>();
List<EmployeeEntity> updateList = new ArrayList<>(); List<EmployeeEntity> updateList = new ArrayList<>();
//获取 数据库 员工 信息 //获取 数据库 员工 信息
List<EmployeeEntity> employeeList = employeeService.getEmployeeSListByOrgIdAll(orgId); List<EmployeeEntity> employeeList = employeeService.getEmployeeSListByOrgId(orgId);
// 预处理 新数据 // 预处理 新数据
HashMap<String, WxCpUser> hashMap = new HashMap<>(); HashMap<String, WxCpUser> hashMap = new HashMap<>();
......
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