From a624f68f50139292a23df6cbfdbd9aa2969267eb Mon Sep 17 00:00:00 2001 From: zhangyue Date: Wed, 12 Aug 2026 16:55:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E7=B3=BB=E7=BB=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/basic/info/command/UserAddExe.java | 6 +++--- .../zcloud/basic/info/command/UserUpdateExe.java | 13 +++++++------ .../com/zcloud/basic/info/domain/model/UserE.java | 2 -- .../repository/impl/UserRepositoryImpl.java | 8 ++++---- 4 files changed, 14 insertions(+), 15 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 a0b94de5..67ea15b1 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 @@ -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.*; @@ -1221,8 +1220,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()); 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 0dece912..c9835482 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 @@ -67,12 +67,6 @@ import java.util.stream.Collectors; @RequiredArgsConstructor @Slf4j public class UserUpdateExe { - private static final Set 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; @@ -836,6 +830,13 @@ public class UserUpdateExe { } CorpInfoDO corpInfoDO = userDO.getCorpinfoId() == null ? null : corpInfoRepository.getById(userDO.getCorpinfoId()); + // 大华定制需求，查询企业和监管端type集合。 + List jgdType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(1); + List qydType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(2); + Set 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()); 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 9d63c91c..8a7dd2c4 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 @@ -7,8 +7,6 @@ import com.jjb.saas.framework.domain.model.BaseE; import com.jjb.saas.framework.utils.DataEncryptDecryptUtil; import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum; import com.zcloud.basic.info.domain.enums.UserFlowFlagEnum; -import com.zcloud.basic.info.domain.enums.UserTypeEnum; -import com.zcloud.basic.info.domain.gateway.DepartmentGateway; import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity; import com.zcloud.gbscommon.utils.ExcelUtils; import com.zcloud.gbscommon.utils.MD5; diff --git 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 index 365e2833..08b769d9 100644 --- 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 @@ -169,7 +169,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i } } QueryWrapper queryWrapper = new QueryWrapper<>(); - List enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); + List enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); if (CollUtil.isNotEmpty(enterpriseType)) { params.remove("enterpriseType"); queryWrapper.in("c.type", enterpriseType); @@ -358,16 +358,16 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i roleDeptAddCmd.setDeptId(userDO.getDepartmentId()); List 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 gbsResult = userFacade.add(userAddCmd); log.info("【普通用户-底座新增】结束,用户id:{},结果:{}", gbsResult.getData(), JSONUtil.toJsonStr(gbsResult)); if (!gbsResult.isSuccess()) {