diff --git a/start/src/main/resources/sdk-prod.yml b/start/src/main/resources/sdk-prod.yml index 9bb56e9..bf21e5a 100644 --- a/start/src/main/resources/sdk-prod.yml +++ b/start/src/main/resources/sdk-prod.yml @@ -39,5 +39,7 @@ archives: humanresources: appKey: A5EF205479D2DFB5E621E159AA8FF34B appSecret: 53130AAAAC791D5B7AFD6D89C51853510190C903405242C49B83DECBBA0ADA5E - commonCorpRoleId: 2008483569812549634 - stockCorpRoleId: 2008483240551297026 + corpTypeZeroRoleId: 2008483569812549634 + corpTypeOneRoleId: 2008483922813562882 + corpTypeTwoRoleId: 2008483240551297026 + corpTypeSixRoleId: 2008488106573082626 diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml index 8549c6b..67e36a3 100644 --- a/start/src/main/resources/sdk.yml +++ b/start/src/main/resources/sdk.yml @@ -42,9 +42,6 @@ openapi: protocol: HTTP defaultPlatform: true ##ciphertext plaintext -humanresources: - commonCorpRoleId: 2008483569812549634 - stockCorpRoleId: 2008483240551297026 type: plaintext apiPlatform: - name: default @@ -52,3 +49,8 @@ humanresources: apiCode: test:01 #多个可以逗号隔开,可以为空 tenantIds: 1838408702262321152 +humanresources: + corpTypeZeroRoleId: 2008483569812549634 + corpTypeOneRoleId: 2008483922813562882 + corpTypeTwoRoleId: 2008483240551297026 + corpTypeSixRoleId: 2008488106573082626 diff --git a/web-app/src/main/java/com/zcloud/human/user/command/HumanUserSyncExe.java b/web-app/src/main/java/com/zcloud/human/user/command/HumanUserSyncExe.java index e45f713..2de0519 100644 --- a/web-app/src/main/java/com/zcloud/human/user/command/HumanUserSyncExe.java +++ b/web-app/src/main/java/com/zcloud/human/user/command/HumanUserSyncExe.java @@ -346,10 +346,23 @@ public class HumanUserSyncExe { log.warn("未找到企业信息,无法按企业类型匹配角色,corpId={}", corpId); return null; } - if (Integer.valueOf(2).equals(corpInfo.getType())) { - return humanResourcesConfig.getStockCorpRoleId(); + Integer corpType = corpInfo.getType(); + if (corpType == null) { + return null; } - return humanResourcesConfig.getCommonCorpRoleId(); + if (Integer.valueOf(0).equals(corpType)) { + return humanResourcesConfig.getCorpTypeZeroRoleId(); + } + if (Integer.valueOf(1).equals(corpType)) { + return humanResourcesConfig.getCorpTypeOneRoleId(); + } + if (Integer.valueOf(2).equals(corpType)) { + return humanResourcesConfig.getCorpTypeTwoRoleId(); + } + if (Integer.valueOf(6).equals(corpType)) { + return humanResourcesConfig.getCorpTypeSixRoleId(); + } + return null; } /** @@ -405,7 +418,7 @@ public class HumanUserSyncExe { private Map getTargetCorpDeptNameIdMap(Long corpId) { ZcloudDepartmentPageQry qry = new ZcloudDepartmentPageQry(); qry.setEqCorpInfoId(corpId); - qry.setEqParentId(corpId); +// qry.setEqParentId(corpId); qry.setPageSize(10000); PageResponse zcloudDepartmentInfoCoPageResponse = zcloudDepartmentFacade.pageByParentId(qry); if (zcloudDepartmentInfoCoPageResponse == null || !zcloudDepartmentInfoCoPageResponse.isSuccess() || zcloudDepartmentInfoCoPageResponse.getData() == null) { diff --git a/web-app/src/main/java/com/zcloud/human/user/config/HumanResourcesConfig.java b/web-app/src/main/java/com/zcloud/human/user/config/HumanResourcesConfig.java index aca8af5..15a9145 100644 --- a/web-app/src/main/java/com/zcloud/human/user/config/HumanResourcesConfig.java +++ b/web-app/src/main/java/com/zcloud/human/user/config/HumanResourcesConfig.java @@ -24,7 +24,11 @@ public class HumanResourcesConfig { */ private String appSecret; - private Long commonCorpRoleId; + private Long corpTypeZeroRoleId; - private Long stockCorpRoleId; + private Long corpTypeOneRoleId; + + private Long corpTypeTwoRoleId; + + private Long corpTypeSixRoleId; }