zy-gbs-cmd: update basicInfo

修改相关方无法登陆bug
2026-08-27 15:53:13 +08:00 · 2026-08-26 10:01:46 +08:00 · 2026-08-26 09:07:53 +08:00 · 2026-08-25 17:26:52 +08:00 · 2026-08-24 14:36:53 +08:00 · 2026-08-21 09:02:02 +08:00
45 changed files with 403 additions and 226 deletions
--- a/start/src/main/resources/sdk-prod.yml
+++ b/start/src/main/resources/sdk-prod.yml
@ -51,7 +51,7 @@ openapi:
      tenantIds: 1838408702262321152
 smb:
  host: 39.100.115.58
-  port: 22022
+  port: 22
  user: root
  password: '@EwLEkf56oTYP-gU'
  basePath: /mnt/gbsfile/gwj/file/
--- a/start/src/main/resources/templates/basicInfo.html
+++ b/start/src/main/resources/templates/basicInfo.html
@ -1,4 +1,4 @@
-<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/8/26 09:51:42) App/basicInfo"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>--</title><script>(function () {
+<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/8/27 15:51:08) App/basicInfo"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>--</title><script>(function () {
      const APP_ENV = {
        antd: {
          'ant-prefix': 'micro-temp',
@ -20,4 +20,4 @@
        redirect: '',
        FRAMEWORK: APP_ENV.antd
      };
-    })();</script><script defer="defer" src="/basicInfo/static/js/55.36ee9e20b46eb55389a0.js"></script><script defer="defer" src="/basicInfo/static/js/386.6988d77ba484fb40fcdb.js"></script><script defer="defer" src="/basicInfo/static/js/848.9e47a832cb06238b4754.js"></script><script defer="defer" src="/basicInfo/static/js/485.c1b7b591b699776b6161.js"></script><script defer="defer" src="/basicInfo/static/js/main.e440451deb844344fb04.js"></script><link href="/basicInfo/static/css/main.6fa32fc45cc1ccc5d2f6.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息、构建时间 */console.log("%c@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/8/26 09:51:42) App/basicInfo Version/master Java/main", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
+    })();</script><script defer="defer" src="/basicInfo/static/js/55.36ee9e20b46eb55389a0.js"></script><script defer="defer" src="/basicInfo/static/js/386.709244a6409e3dec6279.js"></script><script defer="defer" src="/basicInfo/static/js/848.832c4024dd904a25bd15.js"></script><script defer="defer" src="/basicInfo/static/js/485.c1b7b591b699776b6161.js"></script><script defer="defer" src="/basicInfo/static/js/main.d0646ce1393840816b4a.js"></script><link href="/basicInfo/static/css/main.6fa32fc45cc1ccc5d2f6.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息、构建时间 */console.log("%c@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/8/27 15:51:08) App/basicInfo Version/配合重庆项目需求变更 Java/dev_sys_config818", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
--- a/start/src/main/resources/templates/basicInfo/static/jjb.config.js
+++ b/start/src/main/resources/templates/basicInfo/static/jjb.config.js
@ -1 +1 @@
-module.exports={javaGit:"http://47.92.113.182:3000/zcloud_gbs/zcloud_gbs_basic_info_gwj.git",javaGitName:"zcloud_gbs_basic_info_gwj",environment:{development:{javaGitBranch:"<branch-name>",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"main",API_HOST:""}},appIdentifier:"basicInfo",contextInject:{appKey:"",fileUrl:""},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8888",host:"127.0.0.1",open:!0},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}};
+module.exports={javaGit:"http://47.92.113.182:3000/zcloud_gbs/zcloud_gbs_basic_info_gwj.git",javaGitName:"zcloud_gbs_basic_info_gwj",environment:{development:{javaGitBranch:"<branch-name>",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"dev_sys_config818",API_HOST:""}},appIdentifier:"basicInfo",contextInject:{appKey:"",fileUrl:""},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8888",host:"127.0.0.1",open:!0},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}};
--- a/start/src/main/resources/templates/basicInfo/static/js/386.709244a6409e3dec6279.js
+++ b/start/src/main/resources/templates/basicInfo/static/js/386.709244a6409e3dec6279.js
--- a/start/src/main/resources/templates/basicInfo/static/js/386.709244a6409e3dec6279.js.LICENSE.txt
+++ b/start/src/main/resources/templates/basicInfo/static/js/386.709244a6409e3dec6279.js.LICENSE.txt
--- a/start/src/main/resources/templates/basicInfo/static/js/848.832c4024dd904a25bd15.js
+++ b/start/src/main/resources/templates/basicInfo/static/js/848.832c4024dd904a25bd15.js
--- a/start/src/main/resources/templates/basicInfo/static/js/848.832c4024dd904a25bd15.js.LICENSE.txt
+++ b/start/src/main/resources/templates/basicInfo/static/js/848.832c4024dd904a25bd15.js.LICENSE.txt
--- a/start/src/main/resources/templates/basicInfo/static/js/848.9e47a832cb06238b4754.js
+++ b/start/src/main/resources/templates/basicInfo/static/js/848.9e47a832cb06238b4754.js
--- a/start/src/main/resources/templates/basicInfo/static/js/main.d0646ce1393840816b4a.js
+++ b/start/src/main/resources/templates/basicInfo/static/js/main.d0646ce1393840816b4a.js
--- a/start/src/main/resources/templates/basicInfo/static/js/main.d0646ce1393840816b4a.js.LICENSE.txt
+++ b/start/src/main/resources/templates/basicInfo/static/js/main.d0646ce1393840816b4a.js.LICENSE.txt
--- a/start/src/main/resources/templates/basicInfo/static/js/main.e440451deb844344fb04.js
+++ b/start/src/main/resources/templates/basicInfo/static/js/main.e440451deb844344fb04.js
--- a/start/src/main/resources/templates/basicInfo/static/package.json
+++ b/start/src/main/resources/templates/basicInfo/static/package.json
@ -32,7 +32,7 @@
    "react": "^18.2.0",
    "react-dom": "^18.2.0",
    "relation-graph": "^2.2.11",
-    "zy-react-library": "^1.3.32"
+    "zy-react-library": "^1.3.28"
  },
  "devDependencies": {
    "@antfu/eslint-config": "^5.4.1",
--- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudCorpFacadeImpl.java
+++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudCorpFacadeImpl.java
@ -6,7 +6,6 @@ import com.alibaba.cola.dto.Response;
 import com.alibaba.cola.dto.SingleResponse;
 import com.zcloud.basic.info.api.CorpInfoServiceI;
 import com.zcloud.basic.info.command.convertor.CorpInfoCoConvertor;
-import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
 import com.zcloud.basic.info.dto.CorpInfoAddCmd;
 import com.zcloud.basic.info.dto.CorpInfoPageQry;
 import com.zcloud.basic.info.dto.CorpInfoUpdateCmd;
@ -18,8 +17,11 @@ import com.zcloud.gbscommon.zcloudcorp.request.ZcloudCorpInfoPageQry;
 import com.zcloud.gbscommon.zcloudcorp.request.ZcloudCorpInfoUpdateCmd;
 import com.zcloud.gbscommon.zcloudcorp.response.ZcloudCorpInfoCO;
 import com.zcloud.gbscommon.zclouddepartment.response.ZcloudDepartmentInfoCo;
+import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.BeanUtils;
+import org.springframework.http.ResponseEntity;

 import javax.annotation.Resource;
 import java.util.Collection;
@ -31,6 +33,9 @@ public class ZcloudCorpFacadeImpl implements ZcloudCorpFacade {
    private CorpInfoServiceI corpInfoService;
    @Resource
    private CorpInfoCoConvertor corpInfoCoConvertor;
+
+    @DubboReference
+    private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade;
    @Override
    public SingleResponse<ZcloudCorpInfoCO> getCorpInfoById(Long id) {
        CorpInfoCO info = corpInfoService.info(id);
@ -84,12 +89,18 @@ public class ZcloudCorpFacadeImpl implements ZcloudCorpFacade {

    @Override
    public MultiResponse<Integer> listCorpType(Integer enterpriseType) {
-        return MultiResponse.of(CorpTypeEnum.getCodesByEnterpriseType(enterpriseType));
+        return MultiResponse.of(zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(enterpriseType));
    }

    @Override
    public Response saveAdminCorp() {
-        return null;
+        Integer type = zcloudTenantTypeConfigFacade.getDefaultType("defaultType0001");
+        if (type == null){
+            return Response.buildFailure("请先配置默认监管端租户类型");
+        }
+        corpInfoService.saveAdminCorp(type);
+
+        return Response.buildSuccess();
    }

 }
--- a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java
+++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java
@ -199,5 +199,9 @@ public class UserController {
    public SingleResponse<UserCO> getUserIdByPhone(@Validated @RequestBody GetUserIdByPhoneCmd getUserIdByPhoneCmd) {
        return userService.getUserIdByPhone(getUserIdByPhoneCmd);
    }
-
-}
+    @ApiOperation("获取默认密码")
+    @PostMapping("/getDefaultPwd")
+    public SingleResponse getDefaultPwd(@Validated @RequestBody GetDefaultPwdCmd cmd) {
+        return userService.getDefaultPwd(cmd);
+    }
+}
--- a/web-app/pom.xml
+++ b/web-app/pom.xml
@ -11,7 +11,6 @@
    <artifactId>web-app</artifactId>
    <packaging>jar</packaging>
    <name>web-app</name>
-
    <dependencies>
        <dependency>
            <groupId>com.zcloud.basic.info</groupId>
--- a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java
@ -1,14 +1,16 @@
 package com.zcloud.basic.info.command;

 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.cola.dto.Response;
 import com.alibaba.cola.exception.BizException;
+import com.jjb.saas.framework.auth.model.SSOUser;
+import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.jjb.saas.system.client.tenant.facade.TenantFacade;
 import com.jjb.saas.system.client.tenant.request.OtaTenantAddCmd;
 import com.zcloud.basic.info.command.convertor.CorpFormCoConvertor;
 import com.zcloud.basic.info.command.convertor.CorpInfoXgfCoConvertor;
 import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum;
-import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
 import com.zcloud.basic.info.domain.gateway.CorpFormGateway;
 import com.zcloud.basic.info.domain.gateway.CorpInfoGateway;
 import com.zcloud.basic.info.domain.gateway.UserGateway;
@ -18,9 +20,12 @@ import com.zcloud.basic.info.dto.DepartmentAddCmd;
 import com.zcloud.basic.info.dto.UserAddCmd;
 import com.zcloud.basic.info.persistence.dataobject.CorpFormDO;
 import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
+import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
+import com.zcloud.basic.info.persistence.dataobject.UserDO;
 import com.zcloud.basic.info.persistence.repository.*;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
 import com.zcloud.gbscommon.utils.Tools;
+import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@ -52,7 +57,8 @@ public class CorpInfoAddExe {
    private final CorpFormCoConvertor corpFormCoConvertor;
    private final CorpFormGateway corpFormGateway;
    private final CorpFormRepository corpFormRepository;
-
+    @DubboReference
+    private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade;

    @Transactional(rollbackFor = Exception.class)
    public Long execute(CorpInfoAddCmd cmd) {
@ -68,7 +74,8 @@ public class CorpInfoAddExe {
            examTypeE.checkList(corpinfoByCode == null ? 0 : corpinfoByCode.size());
        }
        try {
-            examTypeE.initPassWord(cmd.getType());
+
+            examTypeE.initPassWord(zcloudTenantTypeConfigFacade.getPasswordByCode(cmd.getType()));
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
@ -102,7 +109,8 @@ public class CorpInfoAddExe {


        UserE userE = new UserE();
-        userE.initCorpInfo(examTypeE,departmentId,corpInfoId);
+
+        userE.initCorpInfo(examTypeE,departmentId,corpInfoId, zcloudTenantTypeConfigFacade.getUserTypeByCode(examTypeE.getType()));
        userRepository.addCorpUser(userE);

        UserEmploymentLogE userEmploymentLogE = new UserEmploymentLogE();
@ -111,5 +119,45 @@ public class CorpInfoAddExe {
        userEmploymentLogRepository.addCorpUserEmploymentLog(userEmploymentLogE);
        return corpInfoId;
    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void saveAdminCorp(Integer type) {
+        try {
+            SSOUser ssoUser = AuthContext.getCurrentUser();
+
+            CorpInfoDO corp = corpInfoRepository.getById(ssoUser.getTenantId());
+            if (corp != null && !ObjectUtils.isEmpty(corp.getId())){
+                throw new BizException("当前用户已存在,无需重复创建");
+            }
+            CorpInfoDO corpInfoDO = new CorpInfoDO();
+            corpInfoDO.setId(ssoUser.getTenantId());
+            corpInfoDO.setCorpinfoId(ssoUser.getTenantId().toString());
+            corpInfoDO.setCorpName(ssoUser.getTenantName());
+            corpInfoDO.setType(type);
+            corpInfoDO.setCorpOrder(0);
+            corpInfoDO.setUseFlag(1);
+            corpInfoDO.setCorpState("filialstate01");
+            corpInfoDO.setCorpStateName("在产");
+            corpInfoRepository.save(corpInfoDO);
+            DepartmentDO departmentDO = new DepartmentDO();
+            departmentDO.setId(ssoUser.getTenantId());
+            departmentDO.setDepartmentId(Tools.get32UUID());
+            departmentDO.setName(ssoUser.getTenantName());
+            departmentDO.setParentId(0L);
+            departmentDO.setCorpinfoId(ssoUser.getTenantId());
+            departmentDO.setDepOrder(0);
+            departmentRepository.save(departmentDO);
+            UserDO userDO = new UserDO();
+            userDO.setId(ssoUser.getTenantId());
+            userDO.setUserId(Tools.get32UUID());
+            userDO.setName(ssoUser.getTenantName());
+            userDO.setCorpinfoId(ssoUser.getTenantId());
+            userDO.setDepartmentId(ssoUser.getTenantId());
+            userDO.setRzFlag(0);
+            userRepository.save(userDO);
+        } catch (Exception e){
+            throw new RuntimeException(e);
+        }
+    }
 }

--- a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java
@ -9,13 +9,13 @@ import com.jjb.saas.system.client.tenant.request.OtaTenantAddCmd;
 import com.zcloud.basic.info.command.convertor.CorpFormCoConvertor;
 import com.zcloud.basic.info.command.convertor.CorpInfoXgfCoConvertor;
 import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum;
-import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
 import com.zcloud.basic.info.domain.gateway.CorpFormGateway;
 import com.zcloud.basic.info.domain.gateway.CorpInfoXgfGateway;
 import com.zcloud.basic.info.domain.model.CorpFormE;
 import com.zcloud.basic.info.domain.model.CorpInfoXgfE;
 import com.zcloud.basic.info.dto.CorpInfoXgfAddCmd;
 import com.zcloud.basic.info.dto.CorpInfoXgfItemCmd;
+import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@ -44,13 +44,16 @@ public class CorpInfoXgfAddExe {
    @DubboReference
    private TenantFacade tenantFacade;

+    @DubboReference
+    private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade;
    @Transactional(rollbackFor = Exception.class)
    public Long execute(CorpInfoXgfAddCmd cmd) {
        CorpInfoXgfE corpInfoXgfE = new CorpInfoXgfE();
        BeanUtils.copyProperties(cmd, corpInfoXgfE);
        Long corpInfoId ;
        try {
-            corpInfoXgfE.setType(CorpTypeEnum.serviceProvider.getCode());
+            // TODO zcloudTenantTypeConfigFacade这个方法是否废弃。目前写死CODE
+            corpInfoXgfE.setType(3);
            corpInfoId = corpInfoXgfGateway.addInfo(corpInfoXgfE);
        } catch (Exception e) {
            throw new RuntimeException(e);
@ -62,6 +65,7 @@ public class CorpInfoXgfAddExe {
        otaTenantAddCmd.setAccount(corpInfoXgfE.getCorpName());
        otaTenantAddCmd.setTenantId(corpInfoId);
        otaTenantAddCmd.setTenantName(corpInfoXgfE.getCorpName());
+        // TODO zcloudTenantTypeConfigFacade这个方法是否废弃。目前写死密码
        otaTenantAddCmd.setPassword("Aa@12345678");
        log.info("CorpInfoXgfAddExe,新增企业调用GBS请求:{}",otaTenantAddCmd.toString());
        Response response = tenantFacade.addOtaTenant(otaTenantAddCmd);
--- a/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java
@ -7,7 +7,6 @@ import com.zcloud.basic.info.command.convertor.DepartmentSuperviseCoConvertor;
 import com.zcloud.basic.info.command.query.CorpInfoQueryExe;
 import com.zcloud.basic.info.command.query.DepartmentQueryExe;
 import com.zcloud.basic.info.domain.enums.CommonFlagEnum;
-import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
 import com.zcloud.basic.info.domain.gateway.DepartmentGateway;
 import com.zcloud.basic.info.domain.gateway.DepartmentSuperviseGateway;
 import com.zcloud.basic.info.domain.model.DepartmentE;
--- 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
@ -23,7 +23,6 @@ import com.zcloud.basic.info.constant.RedisConstant;
 import com.zcloud.basic.info.domain.config.CodeConfig;
 import com.zcloud.basic.info.domain.config.DaHuaConfig;
 import com.zcloud.basic.info.domain.enums.CommonFlagEnum;
-import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
 import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum;
 import com.zcloud.basic.info.domain.enums.UserFlowFlagEnum;
 import com.zcloud.basic.info.domain.gateway.*;
@ -34,6 +33,7 @@ import com.zcloud.basic.info.persistence.repository.*;
 import com.zcloud.gbscommon.dahua.cmd.DaHuaPersonSyncCmd;
 import com.zcloud.gbscommon.dahua.facade.ZcloudDaHuaFacade;
 import com.zcloud.gbscommon.utils.*;
+import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@ -105,6 +105,8 @@ public class UserAddExe {
    private final DaHuaConfig daHuaConfig;
    @DubboReference
    private ZcloudDaHuaFacade zcloudDaHuaFacade;
+    @DubboReference
+    private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade;

    @Transactional(rollbackFor = Exception.class)
    public boolean execute(UserAddCmd cmd) {
@ -188,9 +190,9 @@ public class UserAddExe {
            userE.setRoleId(roleId);
        }
        try {
-            userE.setUserType(CorpTypeEnum.getUserTypeByCode(corpInfoDO.getType()));
+            userE.setUserType(zcloudTenantTypeConfigFacade.getUserTypeByCode(corpInfoDO.getType()));

-            userE.resetPassword(corpInfoDO.getType());
+            userE.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType()));
            res = userGateway.add(userE);
            if (corpInfoDO != null && !ObjectUtils.isEmpty(corpInfoDO.getCorpName())) {
                corpName = corpInfoDO.getCorpName();
@ -531,7 +533,7 @@ public class UserAddExe {
            log.warn("同步大华平台Dubbo调用异常（不影响本地数据保存）: {}", e.getMessage());
            return result;
        }
-        
+
        log.info("========== Dubbo调用返回结果 ==========");
        log.info("返回对象: syncResp={}", syncResp);
        if (syncResp != null) {
@ -1009,7 +1011,7 @@ public class UserAddExe {
        if (corpInfoDO == null) {
            throw new BizException("企业信息不存在，corpinfoId=" + userE.getCorpinfoId());
        }
-        userE.setUserType(CorpTypeEnum.getUserTypeByCode(corpInfoDO.getType()));
+        userE.setUserType(zcloudTenantTypeConfigFacade.getUserTypeByCode(corpInfoDO.getType()));
        Long roleId = userRepository.getDefaultRoleId();
        if (roleId == null) {
            throw new BizException("未创建默认通用角色，请联系管理员");
@ -1048,7 +1050,9 @@ public class UserAddExe {
                }
            } else {
                List<UserE> userEList = userCoConvertor.convertDOsToEs(userList);
-                userE.checkXGfPhone(userEList);
+                // TODO zcloudTenantTypeConfigFacade特定业务，写死的defaultType0003
+                Integer xgfCode = zcloudTenantTypeConfigFacade.getDefaultType("defaultType0003");
+                userE.checkXGfPhone(userEList,xgfCode);
                Optional<UserDO> optionalUserDO = userList.stream()
                        .filter(u -> AuthContext.getTenantId().equals(u.getCorpinfoId()) || u.getCorpinfoId() == null)
                        .findFirst();
@ -1221,8 +1225,9 @@ public class UserAddExe {
        BeanUtils.copyProperties(userE, userEmploymentLogE);
        boolean res = false;
        try {
-            userE.setUserType(CorpTypeEnum.getUserTypeByCode(corpInfoDO.getType()));
-            userE.resetPassword(corpInfoDO.getType());
+
+            userE.setUserType(zcloudTenantTypeConfigFacade.getUserTypeByCode(corpInfoDO.getType()));
+            userE.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType()));
            userE.setDepartmentLeaderFlag(0);
            userE.setUserId(Tools.get32UUID());
            userE.setRzFlag(CommonFlagEnum.YES.getCode());
--- a/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java
@ -30,6 +30,7 @@ import com.zcloud.basic.info.persistence.repository.UserRepository;
 import com.zcloud.gbscommon.excelEntity.UserExcelImportEntity;
 import com.zcloud.gbscommon.utils.ExcelUtils;
 import com.zcloud.gbscommon.utils.UuidUtil;
+import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade;
 import lombok.AllArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.BeanUtils;
@ -64,7 +65,8 @@ public class UserImportExe {
    private DeptFacade deptFacade;
    @DubboReference
    private UserFacade userFacade;
-
+    @DubboReference
+    private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade;
    @Transactional(rollbackFor = Exception.class)
    public void importUserTable(MultipartFile file, Integer corpFlag) {
        Long corpinfoId = AuthContext.getTenantId();
@ -420,7 +422,7 @@ public class UserImportExe {
        user.setUserIdCard(null);
        user.setPersonnelType(importEntity.getPersonnelType());
        user.setPersonnelTypeName(importEntity.getPersonnelType());
-        user.resetPassword(corpInfoDO.getType());
+        user.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType()));
        userGateway.add(user);
        String corpName = null;
        if(corpInfoDO != null && !ObjectUtils.isEmpty(corpInfoDO.getCorpName())){
--- 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
@ -32,6 +32,8 @@ import com.zcloud.gbscommon.zcloudhidden.request.HiddenUpdateCmd;
 import com.zcloud.gbscommon.zcloudhidden.response.HiddenListByUserCO;
 import com.zcloud.gbscommon.zcloudrisk.facade.ZcloudRiskFacade;
 import lombok.RequiredArgsConstructor;
+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.beans.BeanUtils;
@ -65,12 +67,6 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
@Slf4j
 public class UserUpdateExe {
-    private static final Set<Integer> DAHUA_CORP_TYPE_CODES = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
-            CorpTypeEnum.OrdinaryEnterprises.getCode(),
-            CorpTypeEnum.groupUnits.getCode(),
-            CorpTypeEnum.share.getCode(),
-            CorpTypeEnum.materialCenter.getCode()
-    )));

    private final UserGateway userGateway;

@ -96,6 +92,10 @@ public class UserUpdateExe {
    @Value("${file.upload.url:}")
    private String fileUrl;

+    @DubboReference
+    private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade;
+
+
    @Transactional(rollbackFor = Exception.class)
    public void execute(UserUpdateCmd userUpdateCmd) {
        log.info("【用户编辑execute入口】开始执行, id={}, name={}, phone={}",
@ -104,10 +104,13 @@ public class UserUpdateExe {

        UserE userE = new UserE();
        BeanUtils.copyProperties(userUpdateCmd, userE);
+
+
        UserDO userDO = userRepository.getInfoById(userUpdateCmd.getId());
        if (userDO == null) {
            throw new BizException("用户不存在，用户id:" + userUpdateCmd.getId());
        }
+
        userE.setDahuaId(userDO.getDahuaId());
        userE.setDahuaCode(userDO.getDahuaCode());
        log.info("【getInfoById查询结果】dahuaId={}, dahuaCode={}, name={}, userIdCard={}",
@ -148,9 +151,10 @@ public class UserUpdateExe {

        CorpInfoDO corpInfoDO = corpInfoRepository.getById(userDO.getCorpinfoId());
        if(corpInfoDO != null){
-            if(corpInfoDO.getType() == CorpTypeEnum.serviceProvider.getCode()
-                    || corpInfoDO.getType() == CorpTypeEnum.cargoOwner.getCode()
-                    || corpInfoDO.getType() == CorpTypeEnum.portUnit.getCode()){
+            // TODO  相关方内容先写死
+            List<Integer> typeList = zcloudTenantTypeConfigFacade.listTypeByParentName("相关方");
+            Set<Integer> typeSet = new HashSet<>(typeList);
+            if(typeSet.contains(corpInfoDO.getType())){
                // 先把其他相关方的账号找出来
                List<UserDO> userByPhoneList = userRepository.listByPhone(userDO.getPhone());
                List<Long> userIds = userByPhoneList.stream().map(UserDO::getId).collect(Collectors.toList());
@ -172,12 +176,13 @@ public class UserUpdateExe {
                    }
                    if(detail.getData() != null){
                        // 调用底座修改账号
-                        userE.resetPassword(corpInfoDO.getType());
+
+                        userE.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType()));
                        userGateway.updateInfoAndPasswordByGBS(userE);
                        if(!userE.getPhone().equals(userDO.getPhone())){
                            // 修改账号了，需要重置密码
                            UserE u = new UserE();
-                            u.resetPassword(corpInfoDO.getType());
+                            u.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType()));
                            for (Long userId : userIds) {
                                userRepository.changePassword(userId, u.getPassword());
                            }
@ -211,11 +216,11 @@ public class UserUpdateExe {
                    if(detail.getData() != null){
                        // 调用底座修改账号
                        userGateway.updateInfoAndPasswordByGBS(userE);
-                        userE.resetPassword(corpInfoDO.getType());
+                        userE.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType()));
                        if(!userE.getPhone().equals(userDO.getPhone())){
                            // 账号修改了，需要重置密码
                            UserE u = new UserE();
-                            u.resetPassword(corpInfoDO.getType());
+                            u.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType()));
                            userRepository.changePassword(userDO.getId(), u.getPassword());
                        }
                    }
@ -812,7 +817,7 @@ public class UserUpdateExe {
        UserE userE = new UserE();
        UserDO userDO = userRepository.getById( id);
        CorpInfoDO corpInfoDO = corpInfoRepository.getById(userDO.getCorpinfoId());
-        userE.resetPassword(corpInfoDO.getType());
+        userE.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType()));
        userRepository.changePassword(id, userE.getPassword());
    }

@ -837,6 +842,13 @@ public class UserUpdateExe {
        }
        CorpInfoDO corpInfoDO = userDO.getCorpinfoId() == null
                ? null : corpInfoRepository.getById(userDO.getCorpinfoId());
+        // 大华定制需求，查询企业和监管端type集合。
+        List<Integer> jgdType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(1);
+        List<Integer> qydType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(2);
+        Set<Integer> DAHUA_CORP_TYPE_CODES = new HashSet<>();
+        DAHUA_CORP_TYPE_CODES.addAll(jgdType);
+        DAHUA_CORP_TYPE_CODES.addAll(qydType);
+
        if (corpInfoDO != null && DAHUA_CORP_TYPE_CODES.contains(corpInfoDO.getType())) {
            try {
                syncDaHuaUserFace(userDO, cmd.getUserAvatarUrl());
--- a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java
@ -9,8 +9,6 @@ import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.jjb.saas.security.starter.api.co.DecryptCmd;
 import com.zcloud.basic.info.command.convertor.CorpInfoCoConvertor;
 import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum;
-import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
-import com.zcloud.basic.info.domain.enums.UserTypeEnum;
 import com.zcloud.basic.info.domain.model.CorpDepartmentE;
 import com.zcloud.basic.info.domain.model.DepartmentE;
 import com.zcloud.basic.info.domain.model.UserE;
@ -24,8 +22,10 @@ import com.zcloud.basic.info.dto.clientobject.UserCO;
 import com.zcloud.basic.info.persistence.dataobject.*;
 import com.zcloud.basic.info.persistence.repository.*;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
+import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;

@ -50,6 +50,8 @@ public class CorpInfoQueryExe {
    private final UserQualificationInfoRepository userQualificationInfoRepository;
    private final CorpFormRepository corpFormRepository;
    private final CorpInfoCoConvertor corpFormCoConvertor;
+    @DubboReference
+    private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade;
 //    private final SecurityClientApi securityClientApi;
 //    private final DesenstizationClientUtil desenstizationClientUtil;

@ -296,7 +298,8 @@ public class CorpInfoQueryExe {
            throw new BizException("企业不存在");
        }
        //是相关方才会校验
-        List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.XGF.getCode());
+        // TODO zcloudTenantTypeConfigFacade特定业务，写死的defaultType0003
+        List<Integer> enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(zcloudTenantTypeConfigFacade.getDefaultType("defaultType0003"));

        if (!enterpriseType.contains(corpInfoDO.getType())) {
            return true;
--- a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java
@ -8,7 +8,6 @@ import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.basic.info.command.convertor.DepartmentCoConvertor;
 import com.zcloud.basic.info.domain.config.QualificationsPageConfig;
 import com.zcloud.basic.info.domain.enums.CommonFlagEnum;
-import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
 import com.zcloud.basic.info.dto.*;
 import com.zcloud.basic.info.dto.clientobject.*;
 import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
@ -19,6 +18,7 @@ import com.zcloud.basic.info.persistence.repository.UserRepository;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
 import com.zcloud.gbscommon.utils.Tools;
 import com.zcloud.gbscommon.zclouddepartment.face.ZcloudDepartmentFacade;
+import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
@ -47,6 +47,9 @@ public class DepartmentQueryExe {
    @DubboReference
    private ZcloudDepartmentFacade zcloudDepartmentFacade;

+    @DubboReference
+    private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade;
+
    /**
     * 分页
     *
@ -192,7 +195,7 @@ public class DepartmentQueryExe {

    public Collection<DepartmentTreeInfoCO> listAllTreeByCorpType(DepartmentTreeQry qry) {
        Map<String, Object> parmas = PageQueryHelper.toHashMap(qry);
-        List<Integer> enterpriseType =CorpTypeEnum.getCodesByEnterpriseType(qry.getEnterpriseType());
+        List<Integer> enterpriseType =zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(qry.getEnterpriseType());
        if (CollUtil.isNotEmpty(enterpriseType)) {
            parmas.put("inType",enterpriseType);
        }
@ -206,7 +209,7 @@ public class DepartmentQueryExe {

    public Collection<DepartmentTreeInfoCO> listAllTreeByCorpTypeAndCorpIds(DepartmentTreeCorpQry qry) {
        Map<String, Object> params = PageQueryHelper.toHashMap(qry);
-        List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType(qry.getEnterpriseType());
+        List<Integer> enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(qry.getEnterpriseType());
        if (CollUtil.isNotEmpty(enterpriseType)) {
            params.put("inType", enterpriseType);
        }
--- 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
@ -16,15 +16,11 @@ 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;
 import com.zcloud.basic.info.domain.model.UserE;
 import com.zcloud.basic.info.dto.*;
 import com.zcloud.basic.info.dto.clientobject.*;
-import com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO;
-import com.zcloud.basic.info.persistence.dataobject.UserDO;
-import com.zcloud.basic.info.persistence.dataobject.UserExpandInfoDO;
-import com.zcloud.basic.info.persistence.dataobject.UserImgDO;
+import com.zcloud.basic.info.persistence.dataobject.*;
 import com.zcloud.basic.info.persistence.repository.CorpInfoRepository;
 import com.zcloud.basic.info.persistence.repository.UserExpandInfoRepository;
 import com.zcloud.basic.info.persistence.repository.UserRepository;
@ -32,9 +28,11 @@ import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
 import com.zcloud.gbscommon.utils.Tools;
 import com.zcloud.gbscommon.utils.ZcloudRedisUtil;
+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;

@ -61,7 +59,8 @@ public class UserQueryExe {
    private ZcloudRedisUtil zcloudRedisUtil;
    private final UserExpandInfoRepository userExpandInfoRepository;
    private final NineCompanyConfig nineCompanyConfig;
-
+    @DubboReference
+    private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade;

     /**
     * 分页
@ -238,6 +237,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{
@ -288,9 +290,11 @@ public class UserQueryExe {
        if(CollUtil.isEmpty(userDOList)){
            throw new BizException("用户不存在");
        }
+        // TODO zcloudTenantTypeConfigFacade特定业务，写死的defaultType0003
+        Integer xgfCode = zcloudTenantTypeConfigFacade.getDefaultTypeNoToken("defaultType0003", cmd.getAppDefaultToken());
        //获取在职的用户取第一个
        UserDO userDO = userDOList.stream().filter(userDO1 -> UserEmploymentFlagEnum.ON.getCode().equals(userDO1.getEmploymentFlag()))
-                .filter(userDO1 -> UserTypeEnum.XGF.getCode().equals(userDO1.getUserType())).findFirst().orElse(null);
+                .filter(userDO1 -> xgfCode.equals(userDO1.getUserType())).findFirst().orElse(null);
        if(userDO == null){
            userDO = userDOList.get(0);
        }
@ -398,5 +402,21 @@ public class UserQueryExe {

        return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
    }
+
+    public SingleResponse getDefaultPwd(GetDefaultPwdCmd cmd){
+        Long corpinfoId = null;
+        // 如果 userid不为空，说明是重置用户密码，根据用户获取corpInfoid
+        if (!ObjectUtils.isEmpty(cmd.getUserId())){
+            UserDO u = userRepository.getById(cmd.getUserId());
+            corpinfoId = u.getCorpinfoId();
+        }
+        // 如果 CorpinfoId，说明是重置企业主账号密码，
+        if(!ObjectUtils.isEmpty(cmd.getCorpinfoId())){
+            corpinfoId = cmd.getCorpinfoId();
+        }
+        CorpInfoDO corp = corpInfoRepository.getById(corpinfoId);
+        String pwd = zcloudTenantTypeConfigFacade.getPasswordByCode(corp.getType());
+        return SingleResponse.of(pwd);
+    }
 }

--- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java
@ -8,7 +8,6 @@ import com.jjb.saas.security.starter.api.co.DecryptCmd;
 import com.zcloud.basic.info.api.CorpInfoServiceI;
 import com.zcloud.basic.info.command.*;
 import com.zcloud.basic.info.command.query.CorpInfoQueryExe;
-import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
 import com.zcloud.basic.info.dto.*;
 import com.zcloud.basic.info.dto.clientobject.*;
 import com.zcloud.gbscommon.utils.Tools;
@ -156,5 +155,10 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI {
    public CorpUserSummaryCO corpUserSummary(CorpUserSummaryQry qry) {
        return corpInfoQueryExe.corpUserSummary(qry);
    }
+
+    @Override
+    public void saveAdminCorp(Integer type) {
+        corpInfoAddExe.saveAdminCorp(type);
+    }
 }

--- a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java
@ -285,4 +285,9 @@ public class UserServiceImpl implements UserServiceI {
    public PageResponse<UserCO> pageByNopermissionAll(UserPageQry qry) {
        return userQueryExe.pageByNopermissionAll(qry);
    }
-}
+
+    @Override
+    public SingleResponse getDefaultPwd(GetDefaultPwdCmd cmd) {
+        return userQueryExe.getDefaultPwd(cmd);
+    }
+}
--- a/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java
@ -59,5 +59,7 @@ public interface CorpInfoServiceI {
    PageResponse<CorpUserStatisticCO> corpUserStatisticPage(CorpUserStatisticQry qry);

    CorpUserSummaryCO corpUserSummary(CorpUserSummaryQry qry);
+
+    void saveAdminCorp(Integer type);
 }

--- a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java
@ -108,5 +108,8 @@ public interface UserServiceI {
    SingleResponse<Long> updateHumanUser(UserUpdateCmd userUpdateCmd);

    PageResponse<UserCO> pageByNopermissionAll(UserPageQry qry);
+
+
+    SingleResponse getDefaultPwd(GetDefaultPwdCmd cmd);
 }

--- a/web-client/src/main/java/com/zcloud/basic/info/dto/AppUserRegisterCmd.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/AppUserRegisterCmd.java
@ -37,5 +37,7 @@ public class AppUserRegisterCmd extends Command {
    @NotEmpty(message = "验证码不能为空")
    private String phoneCode;

+    @ApiModelProperty(value = "app所属租户", name = "appDefaultToken", required = true)
+    private Long appDefaultToken;
 }

--- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java
@ -178,5 +178,6 @@ public class CorpInfoAddCmd extends Command {
    private List<CorpInfoXgfItemCmd> selectfromList;
    @ApiModelProperty(value = "经营范围", name = "natureBusiness")
    private String natureBusiness;
+
 }

--- 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;
+
 }

--- a/web-client/src/main/java/com/zcloud/basic/info/dto/GetDefaultPwdCmd.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/GetDefaultPwdCmd.java
@ -0,0 +1,28 @@
+package com.zcloud.basic.info.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * web-client
+ *
+ * @Author zhangyue
+ * @Date 2025-11-04 14:07:38
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class GetDefaultPwdCmd {
+
+    private Long userId;
+
+    private Long corpinfoId;
+
+
+
+}
+
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAppLoginCmd.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAppLoginCmd.java
@ -29,5 +29,10 @@ public class UserAppLoginCmd {
    @NotEmpty(message = "验证码key不能为空")
    private String captchaKey;

+
+
+    @ApiModelProperty(value = "app所属租户", name = "appDefaultToken", required = true)
+    private Long appDefaultToken;
+
 }

--- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpDepartmentCO.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpDepartmentCO.java
@ -18,8 +18,6 @@ public class CorpDepartmentCO extends ClientObject {
    //主键
    @ApiModelProperty(value = "企业主键")
    private Long id;
-    @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)")
-    private Integer type;
    @ApiModelProperty(value = "企业名称")
    private String corpName;
    //行业分类
--- a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java
+++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java
@ -1,91 +1,91 @@
-package com.zcloud.basic.info.domain.enums;
-
-import cn.hutool.core.collection.CollUtil;
-import lombok.Getter;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * corp_info 中的type字段枚举(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)
- * 与传入enterpriseType中的关联关系
- * .企业类型1：监管 2：企业 3：相关方
- */
-@Getter
-public enum CorpTypeEnum {
-    // TODO 若修改默认密码通知前端同步修改
-    OrdinaryEnterprises(0,"普通企业",UserTypeEnum.QY.getCode(), "Bb@12345678"),
-    groupUnits(1, "集团单位",UserTypeEnum.QY.getCode(), "Bb@12345678"),
-    share(2,"股份单位",UserTypeEnum.JG.getCode(), "Aa@12345678"),
-    serviceProvider(3, "相关方企业",UserTypeEnum.XGF.getCode(), "Cc@12345678"),
-    cargoOwner(4, "货主单位",UserTypeEnum.XGF.getCode(), "Cc@12345678"),
-    portUnit(5, "驻港单位",UserTypeEnum.QY.getCode(), "Bb@12345678"),
-    materialCenter(6, "物资中心",UserTypeEnum.QY.getCode(), "Bb@12345678");
-
-    private static final Map<Integer, List<Integer>> ENTERPRISE_TYPE_CODE_MAP = new HashMap<>();
-
-    private final Integer code;
-    private final String name;
-    //传入的企业类型企业类型 1：监管 2：企业 3：相关方
-    private final Integer userType;
-    private final String defaultPassword;
-
-    CorpTypeEnum(Integer code, String name, Integer userType, String defaultPassword) {
-        this.code = code;
-        this.name = name;
-        this.userType = userType;
-        this.defaultPassword = defaultPassword;
-    }
-    static {
-        Arrays.stream(CorpTypeEnum.values())
-                .collect(Collectors.groupingBy(CorpTypeEnum::getUserType))
-                .forEach((userType, corpTypes) ->
-                        ENTERPRISE_TYPE_CODE_MAP.put(
-                                userType,
-                                corpTypes.stream().map(CorpTypeEnum::getCode).collect(Collectors.toList())
-                        )
-                );
-    }
-
-    public static List<Integer> getCodesByEnterpriseType(Integer enterpriseType) {
-        return ENTERPRISE_TYPE_CODE_MAP.getOrDefault(enterpriseType, Collections.emptyList());
-    }
-    public static List<Integer> getCodesByEnterpriseType(List<Integer> enterpriseTypeList) {
-        if(CollUtil.isEmpty(enterpriseTypeList)){
-            return null;
-        }
-        return enterpriseTypeList.stream()
-                .flatMap(enterpriseType ->
-                        ENTERPRISE_TYPE_CODE_MAP.getOrDefault(enterpriseType, Collections.emptyList()).stream())
-                .distinct()
-                .collect(Collectors.toList());
-
-    }
-
-    public static Integer getUserTypeByCode(Integer code) {
-        for (CorpTypeEnum corpType : values()) {
-            if (corpType.code.equals(code)) {
-                return corpType.userType;
-            }
-        }
-        return null;
-    }
-
-    public static String getPasswordByCode(Integer code) {
-        for (CorpTypeEnum corpType : values()) {
-            if (corpType.code.equals(code)) {
-                return corpType.defaultPassword;
-            }
-        }
-        return null;
-    }
-
-    public static String getNameByCode(Integer code) {
-        for (CorpTypeEnum corpType : values()) {
-            if (corpType.code.equals(code)) {
-                return corpType.name;
-            }
-        }
-        return null;
-    }
-}
+//package com.zcloud.basic.info.domain.enums;
+//
+//import cn.hutool.core.collection.CollUtil;
+//import lombok.Getter;
+//
+//import java.util.*;
+//import java.util.stream.Collectors;
+//
+///**
+// * corp_info 中的type字段枚举(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)
+// * 与传入enterpriseType中的关联关系
+// * .企业类型1：监管 2：企业 3：相关方
+// */
+//@Getter
+//public enum CorpTypeEnum {
+//    // TODO 若修改默认密码通知前端同步修改
+//    OrdinaryEnterprises(0,"普通企业",UserTypeEnum.QY.getCode(), "Bb@12345678"),
+//    groupUnits(1, "集团单位",UserTypeEnum.QY.getCode(), "Bb@12345678"),
+//    share(2,"股份单位",UserTypeEnum.JG.getCode(), "Aa@12345678"),
+//    serviceProvider(3, "相关方企业",UserTypeEnum.XGF.getCode(), "Cc@12345678"),
+//    cargoOwner(4, "货主单位",UserTypeEnum.XGF.getCode(), "Cc@12345678"),
+//    portUnit(5, "驻港单位",UserTypeEnum.XGF.getCode(), "Cc@12345678"),
+//    materialCenter(6, "物资中心",UserTypeEnum.QY.getCode(), "Bb@12345678");
+//
+//    private static final Map<Integer, List<Integer>> ENTERPRISE_TYPE_CODE_MAP = new HashMap<>();
+//
+//    private final Integer code;
+//    private final String name;
+//    //传入的企业类型企业类型 1：监管 2：企业 3：相关方
+//    private final Integer userType;
+//    private final String defaultPassword;
+//
+//    CorpTypeEnum(Integer code, String name, Integer userType, String defaultPassword) {
+//        this.code = code;
+//        this.name = name;
+//        this.userType = userType;
+//        this.defaultPassword = defaultPassword;
+//    }
+//    static {
+//        Arrays.stream(CorpTypeEnum.values())
+//                .collect(Collectors.groupingBy(CorpTypeEnum::getUserType))
+//                .forEach((userType, corpTypes) ->
+//                        ENTERPRISE_TYPE_CODE_MAP.put(
+//                                userType,
+//                                corpTypes.stream().map(CorpTypeEnum::getCode).collect(Collectors.toList())
+//                        )
+//                );
+//    }
+//
+//    public static List<Integer> getCodesByEnterpriseType(Integer enterpriseType) {
+//        return ENTERPRISE_TYPE_CODE_MAP.getOrDefault(enterpriseType, Collections.emptyList());
+//    }
+//    public static List<Integer> getCodesByEnterpriseType(List<Integer> enterpriseTypeList) {
+//        if(CollUtil.isEmpty(enterpriseTypeList)){
+//            return null;
+//        }
+//        return enterpriseTypeList.stream()
+//                .flatMap(enterpriseType ->
+//                        ENTERPRISE_TYPE_CODE_MAP.getOrDefault(enterpriseType, Collections.emptyList()).stream())
+//                .distinct()
+//                .collect(Collectors.toList());
+//
+//    }
+//
+//    public static Integer getUserTypeByCode(Integer code) {
+//        for (CorpTypeEnum corpType : values()) {
+//            if (corpType.code.equals(code)) {
+//                return corpType.userType;
+//            }
+//        }
+//        return null;
+//    }
+//
+//    public static String getPasswordByCode(Integer code) {
+//        for (CorpTypeEnum corpType : values()) {
+//            if (corpType.code.equals(code)) {
+//                return corpType.defaultPassword;
+//            }
+//        }
+//        return null;
+//    }
+//
+//    public static String getNameByCode(Integer code) {
+//        for (CorpTypeEnum corpType : values()) {
+//            if (corpType.code.equals(code)) {
+//                return corpType.name;
+//            }
+//        }
+//        return null;
+//    }
+//}
--- a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/UserTypeEnum.java
+++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/UserTypeEnum.java
@ -1,29 +0,0 @@
-package com.zcloud.basic.info.domain.enums;
-
-import lombok.Getter;
-@Getter
-public enum UserTypeEnum {
-    JG(1,"监管"),
-    QY(2,"企业"),
-    XGF(3,"相关方")
-    ;
-    private final Integer code;
-    private final String name;
-
-    UserTypeEnum(Integer code, String name) {
-        this.code = code;
-        this.name = name;
-    }
-
-    public static Integer getUserType(Integer corpType){
-        if (corpType.equals(CorpTypeEnum.OrdinaryEnterprises.getCode()) ||
-            corpType.equals(CorpTypeEnum.groupUnits.getCode())){
-            return UserTypeEnum.QY.getCode();
-        }else if (corpType.equals(CorpTypeEnum.share.getCode())){
-            return UserTypeEnum.JG.getCode();
-        }else {
-            return UserTypeEnum.XGF.getCode();
-        }
-    }
-
-}
--- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpDepartmentE.java
+++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpDepartmentE.java
@ -18,14 +18,11 @@ import java.util.stream.Collectors;
 */
@Data
 public class CorpDepartmentE extends ClientObject {
-
    //主键
    @ApiModelProperty(value = "企业主键")
    private Long id;
    @ApiModelProperty(value = "企业名称")
    private String corpName;
-    @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)")
-    private Integer type;
    //行业分类
    @ApiModelProperty(value = "行业分类")
    private String corpType;
--- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java
+++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java
@ -4,7 +4,7 @@ import com.alibaba.cola.domain.Entity;
 import com.alibaba.cola.exception.BizException;
 import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.jjb.saas.framework.domain.model.BaseE;
-import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
+import com.zcloud.basic.info.domain.enums.CorpStateEnum;
 import com.zcloud.gbscommon.utils.MD5;
 import com.zcloud.gbscommon.utils.Sm2Util;
 import io.swagger.annotations.ApiModelProperty;
@ -188,8 +188,8 @@ public class CorpInfoE extends BaseE {

    @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西")
    private Integer portArea;
-    public void initPassWord(Integer type) {
-        String encrypt = Sm2Util.encryptHex(MD5.md5(CorpTypeEnum.getPasswordByCode(type)), publicKey);
+    public void initPassWord(String password) {
+        String encrypt = Sm2Util.encryptHex(MD5.md5(password), publicKey);
        this.setPassword(encrypt);
    }

--- 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
@ -5,11 +5,9 @@ import com.alibaba.cola.exception.BizException;
 import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.jjb.saas.framework.domain.model.BaseE;
 import com.jjb.saas.framework.utils.DataEncryptDecryptUtil;
-import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
 import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum;
 import com.zcloud.basic.info.domain.enums.UserFlowFlagEnum;
 import com.zcloud.basic.info.domain.enums.UserRZFlagEnum;
-import com.zcloud.basic.info.domain.enums.UserTypeEnum;
 import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity;
 import com.zcloud.gbscommon.utils.ExcelUtils;
 import com.zcloud.gbscommon.utils.MD5;
@ -171,7 +169,9 @@ public class UserE extends BaseE {
    // 性别
    private String sex;
    // 微信openid
+
    private String openId;
+    private Long appDefaultToken;

    public static Boolean checkUserInfoComplete(UserE userE, Integer flowFlag) {
        return StringUtils.isNotEmpty(userE.getUsername()) &&
@ -285,12 +285,12 @@ public class UserE extends BaseE {
        }
    }

-    public void initCorpInfo(CorpInfoE examTypeE, Long departmentId, Long corpInfoId) {
+    public void initCorpInfo(CorpInfoE examTypeE, Long departmentId, Long corpInfoId, Integer userType) {
        this.setId(corpInfoId);
        this.setName(examTypeE.getCorpName());
        this.setUsername(examTypeE.getCorpName());
        this.setDepartmentId(departmentId);
-        this.setUserType(CorpTypeEnum.getUserTypeByCode(examTypeE.getType()));
+        this.setUserType(userType);
        this.setCorpinfoId(corpInfoId);
        this.setOrgId(examTypeE.getTenantId());
        this.setTenantId(examTypeE.getTenantId());
@ -302,8 +302,8 @@ public class UserE extends BaseE {
        }
    }

-    public void resetPassword(Integer type) {
-        String encrypt = Sm2Util.encryptHex(MD5.md5(CorpTypeEnum.getPasswordByCode(type)), publicKey);
+    public void resetPassword(String password) {
+        String encrypt = Sm2Util.encryptHex(MD5.md5(password), publicKey);
        this.setPassword(encrypt);
    }

@ -382,7 +382,7 @@ public class UserE extends BaseE {
        }
    }

-    public void checkXGfPhone(List<UserE> userEList) {
+    public void checkXGfPhone(List<UserE> userEList, Integer xgfCode) {

        //判断在其他企业是否是固定人员
        List<UserE> userList = userEList.stream().
@ -397,7 +397,7 @@ public class UserE extends BaseE {
        }
        userEList.forEach(userE -> {
            //如果是企业不是相关方企业，则不行
-            if(!userE.getUserType().equals(UserTypeEnum.XGF.getCode()) && (UserEmploymentFlagEnum.ON.getCode().equals(userE.getEmploymentFlag())
+            if(!userE.getUserType().equals(xgfCode) && (UserEmploymentFlagEnum.ON.getCode().equals(userE.getEmploymentFlag())
                    || UserEmploymentFlagEnum.ENTRY_AUDIT.getCode().equals(userE.getEmploymentFlag())
                    || UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode().equals(userE.getEmploymentFlag()))){
                throw new BizException("当前手机号已存在");
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java
@ -12,6 +12,7 @@ import com.zcloud.basic.info.domain.gateway.UserGateway;
 import com.zcloud.basic.info.domain.model.UserE;
 import com.zcloud.basic.info.persistence.dataobject.UserDO;
 import com.zcloud.basic.info.persistence.repository.UserRepository;
+import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade;
 import lombok.AllArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.BeanUtils;
@ -37,7 +38,8 @@ public class UserGatewayImpl implements UserGateway {
    private final UserRepository userRepository;
    @DubboReference
    private UserFacade userFacade;
-
+    @DubboReference
+    private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade;
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean add(UserE userE) {
@ -74,7 +76,8 @@ public class UserGatewayImpl implements UserGateway {
        // 新增用户默认在职
        userE.setEmploymentFlag(UserEmploymentFlagEnum.ON.getCode());
        BeanUtils.copyProperties(userE, d);
-        userE.resetPassword(3);
+        // TODO zcloudTenantTypeConfigFacade 相关方默认写死
+        userE.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(3));
        d.setPassword(userE.getPassword());
        userRepository.saveUserXgf(d);
        userE.setId(d.getId());
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java
@ -195,8 +195,9 @@ public class UserDO extends BaseDO {
    @ApiModelProperty(value = "是否缴纳其他人身伤害保险")
    private Integer isBf;

-
-
+    @ApiModelProperty(value = "app所属租户")
+    @TableField(exist = false)
+    private Long appDefaultToken;



@ -209,4 +210,4 @@ public class UserDO extends BaseDO {
        this.userId = userId;
    }

-}
+}
--- 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
@ -21,7 +21,6 @@ import com.jjb.saas.system.client.unit.facade.UnitFacade;
 import com.jjb.saas.system.client.unit.request.OpeUnitAddCmd;
 import com.jjb.saas.system.client.unit.request.OpeUnitUpdateCmd;
 import com.jjb.saas.system.client.user.facade.UserFacade;
-import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
 import com.zcloud.basic.info.domain.enums.CorpUseFlagEnum;
 import com.zcloud.basic.info.domain.enums.MenuEnum;
 import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
@ -32,6 +31,8 @@ import com.zcloud.basic.info.persistence.mapper.CorpInfoMapper;
 import com.zcloud.basic.info.persistence.repository.CorpInfoRepository;
 import com.zcloud.basic.info.utils.Query;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
+import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade;
+import com.zcloud.gbscommon.zcloudsysconfig.response.ZcloudTenantTypeConfigCo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@ -64,6 +65,8 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
    @DubboReference
    private TenantTypeFacade tenantTypeFacade;

+    @DubboReference
+    private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade;

    @Override
    public PageResponse<CorpInfoDO> listPage(Map<String, Object> params) {
@ -80,12 +83,14 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
        QueryWrapper<CorpInfoDO> queryWrapper = new QueryWrapper<>();
        String menuPerms = "";
        initParams(queryWrapper, menuPerms, params);
+        SSOUser ssoUser = AuthContext.getCurrentUser();
+        queryWrapper.eq("tenant_id", ssoUser.getTenantId());
        IPage<CorpInfoDO> result = corpInfoMapper.selectUserBasicPage(iPage, queryWrapper, menuPerms);
        return PageHelper.pageToResponse(result, result.getRecords());
    }
    private void initParams(QueryWrapper<CorpInfoDO> queryWrapper, String menuPerms, Map<String, Object> params){
        queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
-        List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
+        List<Integer> enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
        if (CollUtil.isNotEmpty(enterpriseType)) {
            queryWrapper.in("type", enterpriseType);
        }
@ -93,12 +98,18 @@ 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"))){
+            List<ZcloudTenantTypeConfigCo> zttcc = zcloudTenantTypeConfigFacade.listTypeByMenuId(Long.valueOf(params.get("menuId").toString()));
+            List<Integer> typeList = zttcc.stream().map(tc -> tc.getCode()).collect(Collectors.toList());
+            if(typeList != null && typeList.size() > 0){
+                queryWrapper.in("type",  typeList);
+            }
+        }
        if (params.get("enterpriseTypeList") != null
                && params.get("enterpriseTypeList") instanceof List){
            List<Integer> enterpriseTypeList = (List<Integer>) params.get("enterpriseTypeList");
            if (enterpriseTypeList !=  null && enterpriseTypeList.size() > 0){
-                List<Integer> entTypeList = CorpTypeEnum.getCodesByEnterpriseType(enterpriseTypeList);
+                List<Integer> entTypeList = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(enterpriseTypeList);
                if (CollUtil.isNotEmpty(entTypeList)) {
                    queryWrapper.in("type", entTypeList);
                }
@ -117,7 +128,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
        IPage<CorpInfoDO> iPage = new Query<CorpInfoDO>().getPage(params);
        QueryWrapper<CorpInfoDO> queryWrapper = new QueryWrapper<>();
        queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
-        List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
+        List<Integer> enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
        if (CollUtil.isNotEmpty(enterpriseType)) {
            queryWrapper.in("type", enterpriseType);
        }
@ -135,7 +146,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
    public List<CorpInfoDO> listAll(Map<String, Object> params) {
        QueryWrapper<CorpInfoDO> queryWrapper = new QueryWrapper<>();
        queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
-        List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
+        List<Integer> enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
        if (CollUtil.isNotEmpty(enterpriseType)) {
            queryWrapper.in("type", enterpriseType);
        }
@ -144,7 +155,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
                && params.get("enterpriseTypeList") instanceof List){
            List<Integer> enterpriseTypeList = (List<Integer>) params.get("enterpriseTypeList");
            if (enterpriseTypeList !=  null && enterpriseTypeList.size() > 0){
-                List<Integer> entTypeList = CorpTypeEnum.getCodesByEnterpriseType(enterpriseTypeList);
+                List<Integer> entTypeList = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(enterpriseTypeList);
                if (CollUtil.isNotEmpty(entTypeList)) {
                    queryWrapper.in("type", entTypeList);
                }
@ -170,7 +181,15 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
        Map<String, Long> tenantTypeMap = tenantTypeResponse.getData().stream().collect(Collectors.toMap(TenantTypeCO::getTenantTypeName, TenantTypeCO::getId));
        OpeUnitAddCmd ouac = new OpeUnitAddCmd();
        ouac.setTenantName(corpInfoDO.getCorpName());
-        ouac.setTenantTypeId(tenantTypeMap.get(CorpTypeEnum.getNameByCode(corpInfoDO.getType())));
+        log.info("tenantTypeMap:{}",tenantTypeMap);
+        log.info("tenantTypeMap:{}",tenantTypeMap.toString());
+        log.info("tenantTypeResponse:{}",tenantTypeResponse.toString());
+        System.out.println(corpInfoDO.getType()+"-------------------corpInfoDO.getType()");
+        log.info("corpInfoDO.getType()", corpInfoDO.getType());
+        log.info("zcloudTenantTypeConfigFacade.getNameByCode(corpInfoDO.getType()):{}", zcloudTenantTypeConfigFacade.getNameByCode(corpInfoDO.getType()));
+        ouac.setTenantTypeId(tenantTypeMap.get(zcloudTenantTypeConfigFacade.getNameByCode(corpInfoDO.getType())));
+
+        log.info("ouac", ouac.getTenantTypeId());
        //企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)
 //        if(corpInfoDO.getType() == 0 || corpInfoDO.getType() == 1 || corpInfoDO.getType() == 2){
 //            ouac.setTenantTypeId(1990693345743208448L);
@ -264,7 +283,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
            params.put("type", Arrays.asList(params.get("eqType")));
        } else {
            if (ObjectUtil.isNotEmpty(params.get("enterpriseType"))) {
-                List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
+                List<Integer> enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
                if (CollUtil.isNotEmpty(enterpriseType)) {
                    params.put("type", enterpriseType);
                }
@ -278,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());
    }
@ -323,8 +344,13 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
        CorpInfoDO corpInfoDO = corpInfoMapper.selectById(AuthContext.getTenantId());
        if(corpInfoDO == null)
            throw new BizException("当前企业不存在");
-        if(CorpTypeEnum.share.getCode().equals(corpInfoDO.getType()))
-            return true;
+        try {
+            if(zcloudTenantTypeConfigFacade.getDefaultType("defaultType0001").equals(corpInfoDO.getType()))
+                return true;
+        } catch (Exception e){
+            throw new BizException("未配置默认监管端租户类型，请联系管理员配置后操作。");
+        }
+
        return false;
    }

@ -340,7 +366,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
    public PageResponse<CorpUserStatisticDO> corpUserStatisticPage(Map<String, Object> params) {
        IPage<CorpUserStatisticDO> iPage = new Query<CorpUserStatisticDO>().getPage(params);
        if (ObjectUtil.isNotEmpty(params.get("enterpriseType"))) {
-            List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
+            List<Integer> enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
            if (CollUtil.isNotEmpty(enterpriseType)) {
                params.put("type", enterpriseType);
            }
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
@ -22,10 +22,8 @@ import com.jjb.saas.system.client.role.response.RoleCO;
 import com.jjb.saas.system.client.user.facade.UserFacade;
 import com.jjb.saas.system.client.user.request.*;
 import com.jjb.saas.system.client.user.response.UserDetailCO;
-import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
 import com.zcloud.basic.info.domain.enums.MenuEnum;
 import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum;
-import com.zcloud.basic.info.domain.enums.UserTypeEnum;
 import com.zcloud.basic.info.domain.model.UserE;
 import com.zcloud.basic.info.persistence.dataobject.DepartmentLeaderStatictiscDO;
 import com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO;
@ -37,6 +35,7 @@ import com.zcloud.gbscommon.utils.PageQueryHelper;
 import com.zcloud.gbscommon.utils.Query;
 import com.zcloud.gbscommon.utils.Tools;
 import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade;
+import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@ -73,6 +72,9 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
    @Autowired
    private RemoteEventPublisher remoteEventPublisher;

+    @DubboReference
+    private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade;
+
    @Override
    public PageResponse<UserDO> listPage(Map<String, Object> params) {

@ -132,7 +134,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
            }
        }
        QueryWrapper<UserDO> queryWrapper = new QueryWrapper<>();
-        List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
+        List<Integer> enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
        if (CollUtil.isNotEmpty(enterpriseType)) {
            params.remove("enterpriseType");
            queryWrapper.in("c.type", enterpriseType);
@ -167,7 +169,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
            }
        }
        QueryWrapper<UserDO> queryWrapper = new QueryWrapper<>();
-        List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
+        List<Integer> enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
        if (CollUtil.isNotEmpty(enterpriseType)) {
            params.remove("enterpriseType");
            queryWrapper.in("c.type", enterpriseType);
@ -356,16 +358,16 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
        roleDeptAddCmd.setDeptId(userDO.getDepartmentId());
        List<RoleDeptAddCmd> roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd);
        userAddCmd.setRoleDepts(roleDeptAddCmdList);
-        
+
        // 打印详细参数，方便排查底座报错原因
        log.info("【普通用户-底座新增】开始");
        log.info("【普通用户-底座新增】参数详情: account={}, name={}, password={}, tenantId(corpinfoId)={}, roleId={}, departmentId={}",
-                userAddCmd.getAccount(), userAddCmd.getName(), 
+                userAddCmd.getAccount(), userAddCmd.getName(),
                userDO.getPassword() != null ? "已设置(长度:" + userDO.getPassword().length() + ")" : "null",
                userDO.getCorpinfoId(), userDO.getRoleId(), userDO.getDepartmentId());
        log.info("【普通用户-底座新增】完整JSON: {}", JSONUtil.toJsonStr(userAddCmd));
        log.info("【普通用户-底座新增】userDO完整JSON: {}", JSONUtil.toJsonStr(userDO));
-        
+
        SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
        log.info("【普通用户-底座新增】结束,用户id:{},结果:{}", gbsResult.getData(), JSONUtil.toJsonStr(gbsResult));
        if (!gbsResult.isSuccess()) {
@ -435,7 +437,8 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
        // 相关方
        userDO.setCorpinfoId(null);
        // 默认是相关方
-        userDO.setUserType(UserTypeEnum.XGF.getCode());
+        // TODO zcloudTenantTypeConfigFacade特定业务，写死的defaultType0003
+        userDO.setUserType(zcloudTenantTypeConfigFacade.getDefaultTypeNoToken("defaultType0003",userDO.getAppDefaultToken()));
        save(userDO);
    }

@ -727,6 +730,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
        Map<String, Object> verifyParam = new HashMap<>();
        verifyParam.put("userIdCard", userIdCard);
        verifyParam.put("id", id);
+        SSOUser ssoUser = AuthContext.getCurrentUser();
+        if(ssoUser != null ){
+            verifyParam.put("tenantId", ssoUser.getTenantId());
+        }
        Integer count = userMapper.countUser(verifyParam);
        if (count > 0) {
            throw new BizException("身份证号已经存在，请联系管理员");
@ -750,6 +757,11 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
        if (CollUtil.isNotEmpty(employmentFlagList)) {
            queryWrapper.in("employment_flag", employmentFlagList);
        }
+
+        SSOUser ssoUser = AuthContext.getCurrentUser();
+        if(ssoUser != null ){
+            queryWrapper.eq("tenant_id", ssoUser.getTenantId());
+        }
        queryWrapper.eq("user_id_card", userIdCard);
        queryWrapper.orderByAsc("create_time");
        return list(queryWrapper);
--- 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,
--- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
@ -495,6 +495,9 @@
            <if test="params.phone != null">
                and phone = #{params.phone}
            </if>
+            <if test="params.tenantId != null">
+                and tenant_id = #{params.tenantId}
+            </if>
        </where>
    </select>

@ -608,7 +611,7 @@
            delete_enum = #{deleteEnum}
        WHERE id = #{userId}
    </update>
-    
+
    <select id="pageByNopermissionAll" resultType="com.zcloud.basic.info.persistence.dataobject.UserDO">
        select
            d.name as department_name,
@ -684,4 +687,4 @@
                 left join post p on p.id = u.post_id
            ${ew.customSqlSegment}
    </select>
-</mapper>
+</mapper>
Author	SHA1	Message	Date
LiuJiaNan	6379afc006	zy-gbs-cmd: update basicInfo	2026-08-27 15:53:13 +08:00
LiuJiaNan	64cde71731	zy-gbs-cmd: update basicInfo	2026-08-26 10:01:46 +08:00
zhangyue	175f218600	修改相关方无法登陆bug	2026-08-26 09:07:53 +08:00
zhangyue	63d883956b	修改导入用户bug	2026-08-25 17:26:52 +08:00
zhangyue	3fbffef136	修改相关方注册	2026-08-24 14:36:53 +08:00
zhangyue	5164ca1543	修改公司判重	2026-08-21 09:02:02 +08:00
zhangyue	fe60fdf166	修改重置密码提示bug	2026-08-20 15:16:08 +08:00
zhangyue	f7dab1e3ce	修改企业列表查询不对bug	2026-08-20 13:59:57 +08:00
zhangyue	4348c4d1af	修改账户管理列表查询bug	2026-08-19 13:56:18 +08:00
zhangyue	2ef177621e	修改账户管理列表查询bug 修改部门管理bug	2026-08-19 10:46:08 +08:00
zhaokai	cc24ca0c8a	Merge branch 'dev_change_0814' into dev # Conflicts: # web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java	2026-08-17 16:56:53 +08:00
zhaokai	2bbad4d84a	Merge branch 'dev_change_0814' into dev	2026-08-17 14:46:28 +08:00
zhaokai	f5fafacf93	refactor(UserE): 移除未使用的枚举导入	2026-08-17 14:25:06 +08:00
zhangyue	3c729cc406	修改corpTypeEnum	2026-08-17 14:23:48 +08:00
zhaokai	f3122dc743	refactor(UserE): 移除未使用的枚举导入	2026-08-17 14:07:56 +08:00
zhaokai	b468eaf7df	Merge branch 'dev_change_0814' into dev # Conflicts: # web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java	2026-08-17 14:07:20 +08:00
zhangyue	0a85038e04	适配系统管理配置	2026-08-13 17:04:57 +08:00
zhangyue	f8c72d18a0	适配系统管理配置	2026-08-13 16:32:47 +08:00
zhangyue	a1ca426edd	适配系统管理配置	2026-08-13 14:25:39 +08:00
zhangyue	b50e4e1082	Merge remote-tracking branch 'origin/dahua_koumen' into dev	2026-08-13 10:11:37 +08:00
zhangxiongfeng	208ddf73ac	2026/8/13	2026-08-13 09:37:45 +08:00
zhangyue	a624f68f50	适配系统管理配置	2026-08-12 16:55:06 +08:00
zhangyue	49d840ea7d	Merge branch 'dev_sys_config' into dev # Conflicts: # web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java # web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java # web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java # web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java # web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java	2026-08-12 15:59:03 +08:00
zhangyue	dd02f40658	临时提交一级租户主账号功能	2026-08-12 15:35:06 +08:00
zhangyue	f1f1684f0b	适配系统管理配置	2026-08-06 17:08:46 +08:00
zhangyue	959c6a2d41	适配系统管理配置	2026-08-06 16:55:01 +08:00
zhangyue	2a7772352c	适配系统管理配置	2026-08-05 15:52:35 +08:00