From cf36acaea9a15958f46e6614c737eeac252866e5 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Mon, 13 Jul 2026 13:54:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(user):=20=E6=B7=BB=E5=8A=A0=E4=B9=9D?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E7=94=A8=E6=88=B7=E6=A0=87=E8=AF=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit ba4945e6518d2997d6555ec7676ba68cb85a98f9)
---
 start/src/main/resources/sdk-prod.yml                |  3 +++
 start/src/main/resources/sdk-prod2.yml               |  3 +++
 .../basic/info/command/query/UserQueryExe.java       | 12 ++++++++++++
 .../zcloud/basic/info/dto/clientobject/UserCO.java   |  3 +++
 4 files changed, 21 insertions(+)

diff --git a/start/src/main/resources/sdk-prod.yml b/start/src/main/resources/sdk-prod.yml
index 6bf30bb0..18e77f36 100644
--- a/start/src/main/resources/sdk-prod.yml
+++ b/start/src/main/resources/sdk-prod.yml
@@ -63,3 +63,6 @@ dahua:
     password: qinan@202604
     clientId: mkmj_management
     clientSecret: 5ef82f7c-9926-46a3-8d07-136fd054849c
+nine:
+  config:
+    companyId: 2008712261453131776
diff --git a/start/src/main/resources/sdk-prod2.yml b/start/src/main/resources/sdk-prod2.yml
index eb12fa57..30fd2c66 100644
--- a/start/src/main/resources/sdk-prod2.yml
+++ b/start/src/main/resources/sdk-prod2.yml
@@ -64,3 +64,6 @@ dahua:
     password: qinan@202604
     clientId: mkmj_management
     clientSecret: 5ef82f7c-9926-46a3-8d07-136fd054849c
+nine:
+  config:
+    companyId: 2590800828822460065
\ 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 eabc7fb2..e6aa6a9e 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
@@ -14,6 +14,7 @@ import com.jjb.saas.system.client.user.facade.UserFacade;
 import com.zcloud.basic.info.command.convertor.CorpInfoCoConvertor;
 import com.zcloud.basic.info.command.convertor.UserCoConvertor;
 import com.zcloud.basic.info.constant.RedisConstant;
+import com.zcloud.basic.info.domain.config.NineCompanyConfig;
 import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum;
 import com.zcloud.basic.info.domain.enums.UserTypeEnum;
 import com.zcloud.basic.info.domain.gateway.UserGateway;
@@ -32,6 +33,7 @@ import com.zcloud.gbscommon.utils.PageQueryHelper;
 import com.zcloud.gbscommon.utils.Tools;
 import com.zcloud.gbscommon.utils.ZcloudRedisUtil;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
@@ -49,6 +51,7 @@ import java.util.stream.Collectors;
  */
 @Component
 @AllArgsConstructor
+@Slf4j
 public class UserQueryExe {
     private final UserRepository userRepository;
     private final UserGateway userGateway;
@@ -57,6 +60,7 @@ public class UserQueryExe {
     private final CorpInfoCoConvertor corpInfoCoConvertor;
     private ZcloudRedisUtil zcloudRedisUtil;
     private final UserExpandInfoRepository userExpandInfoRepository;
+    private final NineCompanyConfig nineCompanyConfig;
 
 
      /**
@@ -236,6 +240,14 @@ public class UserQueryExe {
         UserDO userDO = userRepository.getInfoById(id);
         UserCO userCO = new UserCO();
         BeanUtils.copyProperties(userDO, userCO);
+        try{
+            Long nineCompanyId = nineCompanyConfig.getCompanyId();
+            userCO.setNineCompanyFlag(nineCompanyId != null && nineCompanyId.equals(userCO.getCorpinfoId()));
+        }catch (Exception e){
+            log.error("获取九公司ID异常", e);
+            e.printStackTrace();
+        }
+
         return SingleResponse.of(userCO);
     }
 
diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java
index 5c24bac1..a419d504 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java
@@ -218,5 +218,8 @@ public class UserCO extends ClientObject {
     private String payNumber;
     @ApiModelProperty(value = "是否缴纳其他人身伤害保险")
     private Integer isBf;
+
+    @ApiModelProperty(value = "是否九公司人员")
+    private Boolean nineCompanyFlag;
 }