From 49400da0804fd0ab56056fbd0a2c9ee36cd091b6 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 15 Sep 2025 16:22:55 +0800
Subject: [PATCH] feat(ai): 增加公司 ID 筛选功能

---
 src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 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 97ea8dc..388c09c 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
@@ -10,9 +10,10 @@
 import cc.mrbird.febs.ai.util.UUID;
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.entity.QueryRequest;
-import cc.mrbird.febs.mall.entity.ClothesTypeArt;
+import cc.mrbird.febs.system.service.IUserService;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -39,6 +40,7 @@
     private final AiMemberRoleMapper aiMemberRoleMapper;
     private final AiProductService aiProductService;
     private final AiMemberRoleProductService aiMemberRoleProductService;
+    private final IUserService iUserService;
 
     @Override
     public AiMemberRole getById(String id) {
@@ -47,9 +49,11 @@
 
     @Override
     public IPage<AiMemberRole> listInPage(AiMemberRole dto, QueryRequest request) {
-
         Page<AiMemberRole> page = new Page<>(request.getPageNum(), request.getPageSize());
         LambdaQueryWrapper<AiMemberRole> query = Wrappers.lambdaQuery(AiMemberRole.class);
+        if (StrUtil.isNotEmpty(dto.getCompanyId())){
+            query.eq(AiMemberRole::getCompanyId, dto.getCompanyId());
+        }
         query.ne(AiMemberRole::getState, 2);
         query.orderByAsc(AiMemberRole::getSort);
         Page<AiMemberRole> pages = aiMemberRoleMapper.selectPage(page, query);
@@ -78,6 +82,7 @@
         entity.setIconImg(dto.getIconImg());
         entity.setSort(dto.getSort());
         entity.setState(dto.getState());
+        entity.setCompanyId(dto.getCompanyId());
         entity.setCreatedTime(new Date());
         this.save( entity);
         return new FebsResponse().success().message("操作成功");
@@ -118,20 +123,24 @@
 
     @Override
     public FebsResponse productSet(AdminMoveChooseInfoDto dto) {
-        String roleId = dto.getRoleId();
+        String chooseId = dto.getChooseId();
+        String companyId = dto.getCompanyId();
         List<String> chooseIds = dto.getChooseIds();
-        AiMemberRole aiMemberRole = this.getById(roleId);
+        AiMemberRole aiMemberRole = this.getById(chooseId);
         if (ObjectUtil.isNotNull(aiMemberRole)) {
             aiMemberRoleProductService.deleteByQuery(
                     Wrappers.lambdaQuery(AiMemberRoleProduct.class)
-                            .eq(AiMemberRoleProduct::getRoleId,roleId)
+                            .eq(AiMemberRoleProduct::getRoleId,chooseId)
+                            .eq(AiMemberRoleProduct::getCompanyId,companyId)
             );
             if(CollUtil.isNotEmpty(chooseIds)){
                 Date createdTime = new Date();
-                for (String chooseId : chooseIds){
+                for (String item : chooseIds){
                     AiMemberRoleProduct entity = new AiMemberRoleProduct();
-                    entity.setRoleId(roleId);
-                    entity.setProductId(chooseId);
+                    entity.setId(UUID.getSimpleUUIDString());
+                    entity.setRoleId(chooseId);
+                    entity.setProductId(item);
+                    entity.setCompanyId(companyId);
                     entity.setCreatedTime(createdTime);
                     aiMemberRoleProductService.getBaseMapper().insert(entity);
                 }

--
Gitblit v1.9.1