From 327698768ff842300496152e4ee7df0bf2e2c52f Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 8 Jul 2025 09:20:36 +0800
Subject: [PATCH] 66666

---
 .../app/expert/service/ExpertFxqService.java  | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java
index 624aa18..cc377ed 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/service/ExpertFxqService.java
@@ -219,8 +219,8 @@ public class ExpertFxqService {
             // 获取数据库模版数据
             LambdaQueryWrapper<FxqTemplateEntity> templateQueryWrapper = new LambdaQueryWrapper<>();
             templateQueryWrapper.eq(FxqTemplateEntity::getCompanyId, companyId);
-            FxqTemplateEntity fxqTemplate = fxqTemplateDao.selectOne(templateQueryWrapper);
-            if (fxqTemplate == null) {
+            List<FxqTemplateEntity> fxqTemplates = fxqTemplateDao.selectList(templateQueryWrapper);
+            if (fxqTemplates == null || fxqTemplates.isEmpty()){
                 // 获取企业模版数据
                 GetTemplateListResponse templateList = fxqTask.getTemplateList(companyFxqCompany.getUnionId());
                 if (templateList.getData() == null || templateList.getData().isEmpty()) {
@@ -262,14 +262,26 @@ public class ExpertFxqService {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                         return null;
                     }
-
-                    // 把第一条数据赋值出去
-                    if (fxqTemplate == null) {
-                        fxqTemplate = fxqTemplateData;
-                    }
                 }
             }
 
+            fxqTemplates = fxqTemplateDao.selectList(templateQueryWrapper);
+            if (fxqTemplates == null || fxqTemplates.isEmpty()) {
+                throw new BusinessException("操作失败：未找到合适模版");
+            }
+
+            FxqTemplateEntity fxqTemplate = null;
+            for (FxqTemplateEntity m : fxqTemplates) {
+                if (m.getTemplateNo().equals("FT1751936689226311")) {
+                    fxqTemplate = m;
+                    break;
+                }
+            }
+
+            if (fxqTemplate == null) {
+                throw new BusinessException("操作失败：未找到合适模版");
+            }
+
             return fxqTemplate;
         } catch (Exception e) {
             throw new BusinessException(e.getMessage());