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

src/main/java/com/tanpu/feo/feojob/jobs/OrgSyncByWxcpJob.java

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

src/main/java/com/tanpu/feo/feojob/service/DepartmentEmployeeService.java

@@ -52,4 +52,9 @@ public class DepartmentEmployeeService extends ServiceImpl<DepartmentEmployeeMap
 				.eq(DepartmentEmployeeEntity::getOrgId, orgId)
 				.eq(DepartmentEmployeeEntity::getDeleteTag, BaseConstant.DeleteTagStr.NOT_DELETED));
 	}
+
+	public List<DepartmentEmployeeEntity> findInfoByOrgIdAll(String orgId) {
+		return departmentEmployeeMapper.selectList(Wrappers.lambdaQuery(DepartmentEmployeeEntity.class)
+				.eq(DepartmentEmployeeEntity::getOrgId, orgId));
+	}
 }

src/main/java/com/tanpu/feo/feojob/service/DepartmentService.java

@@ -29,4 +29,9 @@ public class DepartmentService extends ServiceImpl<DepartmentMapper, DepartmentE
 				.eq(DepartmentEntity::getOrgId, orgId)
 				.eq(DepartmentEntity::getDeleteTag, BaseConstant.DeleteTagStr.NOT_DELETED));
 	}
+
+	public List<DepartmentEntity> findDepartmentByOrgIdAll(String orgId) {
+		return departmentMapper.selectList(Wrappers.lambdaQuery(DepartmentEntity.class)
+				.eq(DepartmentEntity::getOrgId, orgId));
+	}
 }

src/main/java/com/tanpu/feo/feojob/service/EmployeeRoleService.java

@@ -30,6 +30,10 @@ public class EmployeeRoleService extends ServiceImpl<EmployeeRoleMapper, Employe
 		return employeeRoleMapper.selectList(Wrappers.lambdaQuery(EmployeeRoleEntity.class).eq(EmployeeRoleEntity::getOrgId, orgId).eq(EmployeeRoleEntity::getDeleteTag,"0"));
 	}
 
+	public List<EmployeeRoleEntity> findInfoByOrgIdAll(String orgId) {
+		return employeeRoleMapper.selectList(Wrappers.lambdaQuery(EmployeeRoleEntity.class).eq(EmployeeRoleEntity::getOrgId, orgId));
+	}
+
 	public List<String> findInfoByOrgIdAndAdmin(String orgId, String roleId) {
 		List<EmployeeRoleEntity> employeeRoleList = employeeRoleMapper.selectList(Wrappers.lambdaQuery(EmployeeRoleEntity.class)
 				.eq(EmployeeRoleEntity::getOrgId, orgId)

src/main/java/com/tanpu/feo/feojob/service/EmployeeService.java

@@ -27,4 +27,8 @@ public class EmployeeService extends ServiceImpl<EmployeeMapper, EmployeeEntity>
 	public List<EmployeeEntity> getEmployeeSListByOrgId(String orgId) {
 		return employeeMapper.selectList(Wrappers.lambdaQuery(EmployeeEntity.class).eq(EmployeeEntity::getOrgId, orgId).eq(EmployeeEntity::getDeleteTag, BaseConstant.DeleteTagStr.NOT_DELETED));
 	}
+
+	public List<EmployeeEntity> getEmployeeSListByOrgIdAll(String orgId) {
+		return employeeMapper.selectList(Wrappers.lambdaQuery(EmployeeEntity.class).eq(EmployeeEntity::getOrgId, orgId));
+	}
 }

src/main/java/com/tanpu/feo/feojob/service/UserInfoService.java

@@ -27,4 +27,8 @@ public class UserInfoService extends ServiceImpl<UserInfoMapper, UserInfoEntity>
 	public List<UserInfoEntity> getUserInfoListByOrgId(String orgId) {
 		return userInfoMapper.selectList(Wrappers.lambdaQuery(UserInfoEntity.class).eq(UserInfoEntity::getOrgId, orgId).eq(UserInfoEntity::getDeletetag, BaseConstant.DeleteTagStr.NOT_DELETED));
 	}
+
+	public List<UserInfoEntity> getUserInfoListByOrgIdAll(String orgId) {
+		return userInfoMapper.selectList(Wrappers.lambdaQuery(UserInfoEntity.class).eq(UserInfoEntity::getOrgId, orgId));
+	}
 }