From f5716228c0517d1c4912c0558a3cb15f6f6806d8 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 10 Apr 2026 13:44:04 +0800
Subject: [PATCH] fix(ai): 修复成员角色申请中公司ID缺失问题
---
src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java
index c6f4d5d..8b6f26c 100644
--- a/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java
@@ -4,6 +4,7 @@
import cc.mrbird.febs.ai.entity.AiCompanyMemberApply;
import cc.mrbird.febs.ai.entity.AiMember;
import cc.mrbird.febs.ai.entity.AiMemberRole;
+import cc.mrbird.febs.ai.enumerates.AiCommonEnum;
import cc.mrbird.febs.ai.mapper.AiCompanyMapper;
import cc.mrbird.febs.ai.mapper.AiCompanyMemberApplyMapper;
import cc.mrbird.febs.ai.mapper.AiMemberRoleMapper;
@@ -32,6 +33,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
/**
@@ -80,11 +82,10 @@
List<ApiMemberRoleVo> list = new ArrayList<>();
LambdaQueryWrapper<AiMemberRole> query = Wrappers.lambdaQuery(AiMemberRole.class);
- if (StrUtil.isNotEmpty(dto.getCompanyId())){
- query.eq(AiMemberRole::getCompanyId, dto.getCompanyId());
- }else{
- query.isNull(AiMemberRole::getCompanyId);
+ if (StrUtil.isBlank(dto.getCompanyId())){
+ dto.setCompanyId(AiCommonEnum.COMPANY_ID.getPrompt());
}
+ query.eq(AiMemberRole::getCompanyId, dto.getCompanyId());
query.eq(AiMemberRole::getState, 1);
List<AiMemberRole> listByQuery = this.getListByQuery(query);
if (CollUtil.isNotEmpty(listByQuery)){
@@ -103,7 +104,7 @@
public String getDefaultMemberRoleId() {
LambdaQueryWrapper<AiMemberRole> queryWrapper = Wrappers.lambdaQuery(AiMemberRole.class);
queryWrapper.eq(AiMemberRole::getState, 1);
- queryWrapper.isNull(AiMemberRole::getCompanyId);
+ queryWrapper.eq(AiMemberRole::getCompanyId, AiCommonEnum.COMPANY_ID.getPrompt());
queryWrapper.orderByAsc(AiMemberRole::getCreatedTime);
queryWrapper.last("limit 1");
List<AiMemberRole> listByQuery = this.getListByQuery(queryWrapper);
@@ -163,8 +164,10 @@
AiCompanyMemberApply entity = new AiCompanyMemberApply();
entity.setMemberId(memberUuid);
+ entity.setCompanyId(aiCompany.getId());
entity.setCompanyCode(aiCompany.getCode());
entity.setCompanyName(aiCompany.getName());
+ entity.setCreatedTime(new Date());
aiCompanyMemberApplyMapper.insert(entity);
return new FebsResponse().success();
--
Gitblit v1.9.1