|
|
@@ -444,17 +444,20 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
|
|
|
private QueryWrapper<WorkContactEmployeeVo> getHubWrapper(HubWorkContactEmployeeHandle handle) {
|
|
|
|
|
|
QueryWrapper<WorkContactEmployeeVo> obj = new QueryWrapper<WorkContactEmployeeVo>();
|
|
|
- obj.in("a.corp_id",getNovelIds());
|
|
|
-
|
|
|
Integer gender = handle.getGender();
|
|
|
String name = handle.getName();
|
|
|
Integer status = handle.getStatus();
|
|
|
String startCreatedAt = handle.getStartCreatedAt();
|
|
|
String endCreatedAt = handle.getEndCreatedAt();
|
|
|
Integer corpId = handle.getCorpId();
|
|
|
- List employeeId = handle.getEmployeeId();
|
|
|
+ List<String> ghIds = handle.getGhIds();
|
|
|
+ String platform = handle.getPlatform();
|
|
|
+ List<Integer> employeeId = handle.getEmployeeId();
|
|
|
List<Integer> authCorpIds = handle.getAuthCorpIds();
|
|
|
|
|
|
+ obj.in("a.corp_id",getNovelIds());
|
|
|
+ obj.in("a.corp_id", authCorpIds);
|
|
|
+
|
|
|
if (name != null && !name.equals("")) {
|
|
|
obj.like("c.name", name);
|
|
|
}
|
|
|
@@ -482,10 +485,15 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
|
|
|
obj.in("a.employee_id", employeeId);
|
|
|
}
|
|
|
|
|
|
- obj.in("a.corp_id", authCorpIds);
|
|
|
+ if (platform != null && !platform.equals("")) {
|
|
|
+ obj.like("d.platform", platform);
|
|
|
+ }
|
|
|
|
|
|
- return obj;
|
|
|
+ if (ghIds != null && ghIds.size() >= 1) {
|
|
|
+ obj.in("d.ghid", ghIds);
|
|
|
+ }
|
|
|
|
|
|
+ return obj;
|
|
|
}
|
|
|
|
|
|
private QueryWrapper<WorkContactEmployeeVo> getWrapper(GetWorkContactEmployeeHandle handle) {
|