From 34f7b5ed4f8cb943995004b506b240848be2a41f Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Thu, 9 Jan 2025 15:07:47 +0800
Subject: [PATCH] 1

---
 application/api/controller/Production.php | 4 ----
 application/api/controller/Web.php        | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/application/api/controller/Production.php b/application/api/controller/Production.php
index 6739f9e..ccde7c9 100644
--- a/application/api/controller/Production.php
+++ b/application/api/controller/Production.php
@@ -1217,10 +1217,6 @@ class Production extends Base
         $typesetInfo['images'] = $images==[]?null:$images;
         $typesetInfo['tables'] = $tables==[]?null:$tables;
 
-
-
-//        return jsonSuccess($typesetInfo);
-
 //        $url = $this->ts_base_url."api/typeset/createDocx";
         $url = "http://192.168.110.110:8081/typeset/createDocx";
 //        $url = "http://192.168.110.110:8081/typeset/testqt";
diff --git a/application/api/controller/Web.php b/application/api/controller/Web.php
index d89e3d6..f8fcafe 100644
--- a/application/api/controller/Web.php
+++ b/application/api/controller/Web.php
@@ -173,11 +173,11 @@ class Web extends Base
         if(!$production_article_info){
             return jsonError("production error");
         }
-        $mains = $this->article_main_obj->where("article_id",$production_article_info['article_id'])->whereIn("state",[0,2])->order("sort asc")->select();
+        $mains = $this->article_main_obj->where("article_id",$production_article_info['article_id'])->whereIn("state",[0,2])->order("sort asc")->find();
         if(!$mains){
             $this->addArticleMainEx($data['article_id']);
         }
-        $mains = $this->article_main_obj->where("article_id",$data['article_id'])->whereIn("state",[0,2])->order("sort asc")->select();
+        $mains = $this->article_main_obj->where("article_id",$production_article_info['article_id'])->whereIn("state",[0,2])->order("sort asc")->select();
         if(!$mains){
             return jsonError("error");
         }