From 63d883956b4d7f9d5b0aff981c4441440a42e3de Mon Sep 17 00:00:00 2001
From: zhangyue <zhangyue>
Date: Tue, 25 Aug 2026 17:26:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zcloud/basic/info/command/UserUpdateExe.java  |  1 -
 .../repository/impl/CorpInfoRepositoryImpl.java       | 11 +++++++++--
 .../src/main/resources/mapper/CorpInfoMapper.xml      |  3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
index 386f3f68..8d195406 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
@@ -814,7 +814,6 @@ public class UserUpdateExe {
         UserE userE = new UserE();
         UserDO userDO = userRepository.getById( id);
         CorpInfoDO corpInfoDO = corpInfoRepository.getById(userDO.getCorpinfoId());
-
         userE.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType()));
         userRepository.changePassword(id, userE.getPassword());
     }
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 d11c16a8..857491e1 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
@@ -297,6 +297,8 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
         if (!ObjectUtils.isEmpty(params.get("menuPath"))) {
             menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
         }
+        SSOUser ssoUser = AuthContext.get();
+        params.put("tenantId",ssoUser.getTenantId());
         IPage<CorpInfoDO> result = corpInfoMapper.corpUserMiddlePage(iPage, params, menuPerms);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
@@ -342,8 +344,13 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
         CorpInfoDO corpInfoDO = corpInfoMapper.selectById(AuthContext.getTenantId());
         if(corpInfoDO == null)
             throw new BizException("当前企业不存在");
-        if(zcloudTenantTypeConfigFacade.getDefaultType("defaultType0001").equals(corpInfoDO.getType()))
-            return true;
+        try {
+            if(zcloudTenantTypeConfigFacade.getDefaultType("defaultType0001").equals(corpInfoDO.getType()))
+                return true;
+        } catch (Exception e){
+            throw new BizException("未配置默认监管端租户类型，请联系管理员配置后操作。");
+        }
+
         return false;
     }
 
diff --git a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml
index 84799507..ec772dce 100644
--- a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml
@@ -43,6 +43,9 @@
         <if test="params.eqCorpState != null and params.eqCorpState.trim() != ''">
             AND c.corp_state = #{params.eqCorpState}
         </if>
+        <if test="params.tenantId != null and params.tenantId != ''">
+            AND c.tenant_id = #{params.tenantId}
+        </if>
         group by c.id
         ORDER BY
         c.corp_order ASC,