zgty/zt-dsc
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'base-version/test' into dev

Browse Source
This commit is contained in:
chenbowen
2026-01-20 10:58:56 +08:00
parent 6e6e946ec8 fdb3536ce3
commit 2c2b1e2692
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/impl/IWorkSyncServiceImpl.java
View File

@@ -16,9 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set; import java.util.Set;
import static com.zt.plat.module.system.service.integration.iwork.IWorkIntegrationErrorCodeConstants.IWORK_ORG_REMOTE_FAILED; import static com.zt.plat.module.system.service.integration.iwork.IWorkIntegrationErrorCodeConstants.IWORK_ORG_REMOTE_FAILED;
@@ -264,12 +262,7 @@ public class IWorkSyncServiceImpl implements IWorkSyncService {
if (StrUtil.isBlank(reqVO.getId())) { if (StrUtil.isBlank(reqVO.getId())) {
return; return;
} }
Map<String, Object> params = query.getParams(); applyQueryId(query, reqVO.getId());
if (params == null) {
params = new HashMap<>();
query.setParams(params);
}
params.put("id", reqVO.getId());
} }
/** /**
@@ -388,12 +381,28 @@ public class IWorkSyncServiceImpl implements IWorkSyncService {
if (StrUtil.isBlank(reqVO.getId())) { if (StrUtil.isBlank(reqVO.getId())) {
return; return;
} }
Map<String, Object> params = query.getParams(); applyQueryId(query, reqVO.getId());
if (params == null) { }
params = new HashMap<>();
query.setParams(params); private void applyQueryId(IWorkOrgBaseQueryReqVO query, String id) {
if (query == null || StrUtil.isBlank(id)) {
return;
}
if (query instanceof IWorkSubcompanyQueryReqVO subcompanyQuery) {
subcompanyQuery.setId(id);
return;
}
if (query instanceof IWorkDepartmentQueryReqVO departmentQuery) {
departmentQuery.setId(id);
return;
}
if (query instanceof IWorkJobTitleQueryReqVO jobTitleQuery) {
jobTitleQuery.setId(id);
return;
}
if (query instanceof IWorkUserQueryReqVO userQuery) {
userQuery.setId(id);
} }
params.put("id", reqVO.getId());
} }