From 9ed9a28e42a2cb083a066021cf613d9acd07422e Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Sep 2025 14:45:42 +0800
Subject: [PATCH] fix(workflow):修复公司工作流查询条件判断逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 72e82f2..ead6ef1 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -742,7 +742,7 @@
if (StrUtil.isNotEmpty(apiXcxLoginDto.getCompanyId())){
AiCompany aiCompany = aiCompanyMapper.selectOne(
Wrappers.lambdaQuery(AiCompany.class)
- .eq(AiCompany::getCode, apiXcxLoginDto.getCode())
+ .eq(AiCompany::getCode, apiXcxLoginDto.getCompanyId())
.last("limit 1")
);
if (ObjectUtil.isNotEmpty(aiCompany)){
@@ -825,6 +825,7 @@
}
@Override
+ @Transactional
public FebsResponse xcxSaveInfo(ApiXcxSaveInfoDto apiXcxSaveInfoDto) {
log.info("name={},phone={},avatar={},sex={}",
apiXcxSaveInfoDto.getNickName(),apiXcxSaveInfoDto.getPhone(),apiXcxSaveInfoDto.getAvatarUrl(),apiXcxSaveInfoDto.getGender());
@@ -861,17 +862,29 @@
mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
}
+ String companyId = apiXcxSaveInfoDto.getCompanyId();
if(ObjectUtil.isNotEmpty(apiXcxSaveInfoDto.getCompanyId())){
- mallMember.setCompanyId(apiXcxSaveInfoDto.getCompanyId());
+ AiCompany aiCompany = aiCompanyMapper.selectOne(
+ Wrappers.lambdaQuery(AiCompany.class)
+ .eq(AiCompany::getCode, apiXcxSaveInfoDto.getCompanyId())
+ .last("limit 1")
+ );
+ if (ObjectUtil.isEmpty(aiCompany)){
+ throw new FebsException("公司编码不存在");
+ }
+ if (ObjectUtil.isNotEmpty(aiCompany)){
+ companyId = aiCompany.getId();
+ }
}
+ mallMember.setCompanyId(companyId);
this.baseMapper.updateById(mallMember);
String memberUuid = mallMember.getMemberUuid();
AiMember aiMember = aiMemberService.getById(memberUuid);
- if (ObjectUtil.isNotEmpty(aiMember) && StrUtil.isNotEmpty(apiXcxSaveInfoDto.getCompanyId())){
+ if (ObjectUtil.isNotEmpty(aiMember) && StrUtil.isNotEmpty(mallMember.getCompanyId())){
aiMemberService.update(null,
Wrappers.lambdaUpdate(AiMember.class)
- .set(AiMember::getCompanyId, aiMember.getCompanyId())
+ .set(AiMember::getCompanyId, mallMember.getCompanyId())
.eq(AiMember::getId, aiMember.getId())
);
}
--
Gitblit v1.9.1