From 2ef177621eabfbe451334cdee06943325bdadc80 Mon Sep 17 00:00:00 2001
From: zhangyue <zhangyue>
Date: Wed, 12 Aug 2026 16:55:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A6=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2bug=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zcloud/basic/info/command/query/UserQueryExe.java     | 4 ++++
 .../main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java  | 3 +++
 .../persistence/repository/impl/CorpInfoRepositoryImpl.java   | 4 +++-
 3 files changed, 10 insertions(+), 1 deletion(-)

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 9f530d8c..5eb0fa06 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
@@ -35,6 +35,7 @@ import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.util.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 
@@ -239,6 +240,9 @@ public class UserQueryExe {
         SSOUser ssoUser = AuthContext.getCurrentUser();
         Long id = ssoUser.getUserId();
         UserDO userDO = userRepository.getInfoById(id);
+        if (userDO == null || ObjectUtils.isEmpty(userDO.getId())){
+            throw new BizException("该未完善基本信息，请联系管理员进行基础信息生成。");
+        }
         UserCO userCO = new UserCO();
         BeanUtils.copyProperties(userDO, userCO);
         try{
diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java
index 52c5486d..15c735e6 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java
@@ -134,5 +134,8 @@ public class CorpInfoPageQry extends PageQuery {
     @ApiModelProperty(value = "排除自己的企业,1：排除", name = "exCludeSelf")
     private Integer exCludeSelf;
 
+
+    private String menuId;
+
 }
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java
index 19278c07..be7eaa49 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java
@@ -96,7 +96,9 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
         if(params.get("exCludeSelf") != null && (Integer) params.get("exCludeSelf") == 1){
             queryWrapper.ne("id", AuthContext.getTenantId());
         }
-
+        if(!ObjectUtils.isEmpty(params.get("menuId"))){
+            queryWrapper.in("type",  zcloudTenantTypeConfigFacade.listTypeByMenuId(Long.valueOf(params.get("menuId").toString())));
+        }
         if (params.get("enterpriseTypeList") != null
                 && params.get("enterpriseTypeList") instanceof List){
             List<Integer> enterpriseTypeList = (List<Integer>) params.get("enterpriseTypeList");