zcloud_gbs
/
zcloud_gbs_basic_info_gwj
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

适配系统管理配置

dev
zhangyue 2026-08-12 16:55:06 +08:00
parent 49d840ea7d
commit a624f68f50
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
View File

@ -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());

13
web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
View File

@ -67,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;
@ -836,6 +830,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());

2
web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
View File

@ -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;

8
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
View File

@ -169,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);
@ -358,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()) {