From e4048873355aa30e2f4296d745972158225fddd6 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 15 Sep 2025 15:57:06 +0800
Subject: [PATCH] feat(ai): 增加产品角色列表和树状图的公司条件过滤
---
src/main/java/cc/mrbird/febs/ai/controller/memberRole/ViewController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/ai/controller/memberRole/ViewController.java b/src/main/java/cc/mrbird/febs/ai/controller/memberRole/ViewController.java
index 9e673bf..b333218 100644
--- a/src/main/java/cc/mrbird/febs/ai/controller/memberRole/ViewController.java
+++ b/src/main/java/cc/mrbird/febs/ai/controller/memberRole/ViewController.java
@@ -69,11 +69,13 @@
Set<String> productIds = new HashSet<>();
AiMemberRole entity = aiMemberRoleService.getById(id);
+ String companyId = entity.getCompanyId();
if(ObjectUtil.isNotNull(entity)){
//右侧数据
LambdaQueryWrapper<AiMemberRoleProduct> query = Wrappers.lambdaQuery(AiMemberRoleProduct.class);
if(StrUtil.isNotEmpty(id)){
query.eq(AiMemberRoleProduct::getRoleId, id);
+ query.eq(AiMemberRoleProduct::getCompanyId, companyId);
}
List<AiMemberRoleProduct> selectedList = aiMemberRoleProductService.selectListByQuery(query);
if(CollUtil.isNotEmpty(selectedList)){
@@ -82,7 +84,7 @@
}
//左侧数据
- List<AiProduct> allList = aiProductService.selectList();
+ List<AiProduct> allList = aiProductService.selectList(companyId);
if(CollUtil.isNotEmpty(allList)){
//stream流操作mallMembers，生成一个新的List<MallMemberVo>
vos = allList.stream().map(AiProduct -> {
@@ -96,7 +98,7 @@
model.addAttribute("productAll", vos);
model.addAttribute("productSelected", productIds);
- model.addAttribute("roleId", id);
+ model.addAttribute("chooseId", id);
return FebsUtil.view("modules/ai/memberRole/productSet");
}
}
--
Gitblit v1.9.1