From e21f58159975957e19831b9ddf96846201f6e47a Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Thu, 8 Jan 2026 14:28:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=B3=A8=E5=86=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/zcloud/basic/info/command/UserAddExe.java  | 5 +++--
 .../com/zcloud/basic/info/command/query/UserQueryExe.java    | 4 +++-
 .../main/java/com/zcloud/basic/info/domain/model/UserE.java  | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
index 67b691fc..15628c31 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
@@ -282,16 +282,17 @@ public class UserAddExe {
         }
 
         UserE userE = new UserE();
-
+        UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userDO.getPhone());
         if (userDO.getCorpinfoId() == null) {
             BeanUtils.copyProperties(cmd, userE);
 
             // user表状态变为入职待审核
             userE.setEmploymentFlag(UserEmploymentFlagEnum.ENTRY_AUDIT.getCode());
+            userE.setFlowFlag(userExpandInfoDO.getFlowFlag());
             userGateway.update(userE);
         } else {
             // 用户有企业id
-            UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userDO.getPhone());
+
             Integer flowFlag = userExpandInfoDO.getFlowFlag();
             if (UserFlowFlagEnum.FIXED.getCode().equals(flowFlag)) {
                 // 固定用户
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 7a016829..f7cbe3d9 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
@@ -242,7 +242,9 @@ public class UserQueryExe {
         //判断用户信息是否完善
         UserE userCheck = new UserE();
         BeanUtils.copyProperties(userDO, userCheck);
-        Boolean b = userCheck.checkUserInfoComplete(userCheck);
+        UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userDO.getPhone());
+        Boolean b = userCheck.checkUserInfoComplete(userCheck,userExpandInfoDO.getFlowFlag());
+
         userLoginCO.setIsInfoComplete(b);
 
         List<Long> userIds = userDOList.stream().map(UserDO::getId).collect(Collectors.toList());
diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
index 40f89474..09c5ff04 100644
--- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
+++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
@@ -161,11 +161,11 @@ public class UserE extends BaseE {
     // 微信openid
     private String openId;
 
-    public static Boolean checkUserInfoComplete(UserE userE) {
+    public static Boolean checkUserInfoComplete(UserE userE, Integer flowFlag) {
         return StringUtils.isNotEmpty(userE.getUsername()) &&
                 StringUtils.isNotEmpty(userE.getPhone()) &&
                 StringUtils.isNotEmpty(userE.getUserIdCard()) &&
-                userE.getFlowFlag() != null;
+                flowFlag != null;
     }