Merge remote-tracking branch 'origin/main' into main

dev_xiangguanfang
SondonYong 2025-12-23 13:31:02 +08:00
commit 068cdffaef
2 changed files with 30 additions and 18 deletions

View File

@ -50,8 +50,11 @@ public class CorpInfoGatewayImpl implements CorpInfoGateway {
if(!CorpInfoE.isCorp()){
d.setAccountContactId(AuthContext.getUserId());
d.setAccountContactName(AuthContext.getName());
}
CorpInfoDO corpInfoDO = corpInfoRepository.getById(AuthContext.getTenantId());
d.setTenantName(corpInfoDO.getCorpName());
}else{
d.setTenantName(AuthContext.getCurrentUser().getTenantName());
}
corpInfoRepository.saveCorp(d);
// corpInfoRepository.save(d);

View File

@ -2,10 +2,12 @@ package com.zcloud.basic.info.persistence.repository.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.cola.dto.MultiResponse;
import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.Response;
import com.alibaba.cola.dto.SingleResponse;
import com.alibaba.cola.exception.BizException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -28,6 +30,7 @@ import com.zcloud.basic.info.persistence.repository.CorpInfoRepository;
import com.zcloud.basic.info.utils.Query;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@ -46,6 +49,7 @@ import java.util.stream.Collectors;
*/
@Service
@RequiredArgsConstructor
@Slf4j
public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, CorpInfoDO> implements CorpInfoRepository {
private final CorpInfoMapper corpInfoMapper;
@ -118,12 +122,17 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
ouac.setAccount(corpInfoDO.getCorpName());
ouac.setTenantId(tenantId);
ouac.setPassword(corpInfoDO.getPassword());
try {
// try {
log.info("创建企业请求底座请求:{}", JSONUtil.toJsonStr(ouac));
SingleResponse<Long> corpId = unitFacade.add(ouac);
corpInfoDO.setId(corpId.getData());
} catch (Exception e){
e.printStackTrace();
log.info("创建企业请求底座返回:{}", JSONUtil.toJsonStr(corpId));
if (corpId.getData() == null) {
throw new BizException("底座添加失败");
}
corpInfoDO.setId(corpId.getData());
// } catch (Exception e){
// e.printStackTrace();
// }
save(corpInfoDO);