zm/tougao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
wangjinlei
2025-01-09 15:07:47 +08:00
parent 6abe90ec53
commit 34f7b5ed4f
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/api/controller/Production.php
View File

@@ -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";

4
application/api/controller/Web.php
View File

@@ -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");
}