From 1eb129d61d77494df1a5729a1a477c123a6ab24d Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 20 Jul 2026 12:18:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(config):=20=E4=BF=AE=E6=94=B9=E4=B9=9D?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E9=85=8D=E7=BD=AE=E6=94=AF=E6=8C=81=E5=A4=9A?= =?UTF-8?q?=E5=85=AC=E5=8F=B8ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- start/src/main/resources/sdk-prod.yml | 2 +- start/src/main/resources/sdk-prod2.yml | 2 +- .../zcloud/basic/info/command/query/UserQueryExe.java | 10 ++++++++-- .../basic/info/domain/config/NineCompanyConfig.java | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/start/src/main/resources/sdk-prod.yml b/start/src/main/resources/sdk-prod.yml index 18e77f36..e5f61c2f 100644 --- a/start/src/main/resources/sdk-prod.yml +++ b/start/src/main/resources/sdk-prod.yml @@ -65,4 +65,4 @@ dahua: clientSecret: 5ef82f7c-9926-46a3-8d07-136fd054849c nine: config: - companyId: 2008712261453131776 + companyId: 2008712261453131776,2046785341004177408 diff --git a/start/src/main/resources/sdk-prod2.yml b/start/src/main/resources/sdk-prod2.yml index 30fd2c66..0e4f891e 100644 --- a/start/src/main/resources/sdk-prod2.yml +++ b/start/src/main/resources/sdk-prod2.yml @@ -66,4 +66,4 @@ dahua: clientSecret: 5ef82f7c-9926-46a3-8d07-136fd054849c nine: config: - companyId: 2590800828822460065 \ No newline at end of file + companyId: 2590800828822460065,2044322367672422400 \ No newline at end of file diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index 6fe09ca3..6bde9d0a 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -241,8 +241,14 @@ public class UserQueryExe { UserCO userCO = new UserCO(); BeanUtils.copyProperties(userDO, userCO); try{ - Long nineCompanyId = nineCompanyConfig.getCompanyId(); - userCO.setNineCompanyFlag(nineCompanyId != null && nineCompanyId.equals(userCO.getCorpinfoId())); + String companyId = nineCompanyConfig.getCompanyId(); + boolean nineCompanyFlag = companyId != null + && userCO.getCorpinfoId() != null + && Arrays.stream(companyId.split(",")) + .map(String::trim) + .filter(item -> !item.isEmpty()) + .anyMatch(item -> item.equals(String.valueOf(userCO.getCorpinfoId()))); + userCO.setNineCompanyFlag(nineCompanyFlag); }catch (Exception e){ log.error("获取九公司ID异常", e); e.printStackTrace(); diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/config/NineCompanyConfig.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/config/NineCompanyConfig.java index 01824ae1..7ba35e51 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/config/NineCompanyConfig.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/config/NineCompanyConfig.java @@ -8,5 +8,5 @@ import org.springframework.stereotype.Component; @ConfigurationProperties(prefix = "nine.config") @Data public class NineCompanyConfig { - private Long companyId; + private String companyId; }