From e7bbb977d03fcee4d42267e187ef10c799eeb8a8 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 03 Feb 2026 18:00:50 +0800
Subject: [PATCH] fix(ai): 修复产品提示分页查询中公司ID为空时的查询异常

---
 src/main/java/cc/mrbird/febs/ai/service/impl/AiProductServiceImpl.java |   47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/ai/service/impl/AiProductServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/service/impl/AiProductServiceImpl.java
index 3135b2e..7aa79f2 100644
--- a/src/main/java/cc/mrbird/febs/ai/service/impl/AiProductServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/ai/service/impl/AiProductServiceImpl.java
@@ -18,6 +18,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
@@ -59,8 +60,9 @@
             query.eq(AiProduct::getCompanyId, dto.getCompanyId());
         }
         query.ne(AiProduct::getState, 2);
-        query.orderByDesc(AiProduct::getHotState);
-        query.orderByAsc(AiProduct::getSort);
+//        query.orderByDesc(AiProduct::getHotState);
+//        query.orderByAsc(AiProduct::getSort);
+        query.orderByAsc(AiProduct::getCreatedTime);
         Page<AiProduct> pages = aiProductMapper.selectPage(page, query);
         List<AiProduct> records = pages.getRecords();
         if (CollUtil.isNotEmpty( records)){
@@ -79,11 +81,36 @@
     }
 
     @Override
+    @Transactional
     public FebsResponse changeState(String id, Integer type, Integer state) {
 
         AiProduct entity = this.getById(id);
         if(ObjectUtil.isNotNull(entity)){
             if(1 == type){
+                if (1 == state){
+                    List<AiProductPointLink> list = aiProductPointLinkService.selectListByQuery(
+                            Wrappers.lambdaQuery(AiProductPointLink.class)
+                                    .eq(AiProductPointLink::getProductId, id)
+                    );
+                    if(CollUtil.isEmpty(list)){
+                        return new FebsResponse().fail().message("请配置知识点");
+                    }
+                    List<AiProductRoleLink> list1 = aiProductRoleLinkService.selectListByQuery(
+                            Wrappers.lambdaQuery(AiProductRoleLink.class)
+                                    .eq(AiProductRoleLink::getProductId, id)
+                    );
+                    if(CollUtil.isEmpty(list1)){
+                        return new FebsResponse().fail().message("请配置AI陪练");
+                    }
+                    List<AiProductQuestionLink> list2 = aiProductQuestionLinkService.selectListByQuery(
+                            Wrappers.lambdaQuery(AiProductQuestionLink.class)
+                                    .eq(AiProductQuestionLink::getProductId, id)
+                    );
+                    if(CollUtil.isEmpty(list2)){
+                        return new FebsResponse().fail().message("请配置AI题目");
+                    }
+                }
+
                 aiProductMapper.update(null,
                         Wrappers.lambdaUpdate(AiProduct.class)
                                 .set(AiProduct::getState, state)
@@ -116,6 +143,7 @@
         entity.setTarget(dto.getTarget());
         entity.setDescription(dto.getDescription());
         entity.setQuestionCount(dto.getQuestionCount());
+        entity.setTalkCnt(dto.getTalkCnt());
         entity.setCreatedTime(new Date());
         this.save(entity);
         return new FebsResponse().success().message("操作成功");
@@ -138,6 +166,7 @@
                             .set(AiProduct::getTarget, dto.getTarget())
                             .set(AiProduct::getDescription, dto.getDescription())
                             .set(AiProduct::getQuestionCount, dto.getQuestionCount())
+                            .set(AiProduct::getTalkCnt, dto.getTalkCnt())
                             .set(AiProduct::getUpdatedTime, new Date())
                             .eq(AiProduct::getId, id)
             );
@@ -255,4 +284,18 @@
         }
         return new FebsResponse().success().message("操作成功");
     }
+
+    @Override
+    public List<AiProduct> listByCategory(AiProduct dto) {
+        LambdaQueryWrapper<AiProduct> query = Wrappers.lambdaQuery(AiProduct.class);
+        if (StrUtil.isNotEmpty(dto.getProductCategoryId())){
+            query.eq(AiProduct::getProductCategoryId, dto.getProductCategoryId());
+        }
+        if (StrUtil.isNotEmpty(dto.getCompanyId())){
+            query.eq(AiProduct::getCompanyId, dto.getCompanyId());
+        }
+        query.ne(AiProduct::getState, 2);
+        query.orderByAsc(AiProduct::getSort);
+        return aiProductMapper.selectList(query);
+    }
 }

--
Gitblit v1.9.1