mkm/nk-lihaink-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

接口修改1

Browse Source
This commit is contained in:
彭桃 2023-02-09 11:14:12 +08:00
parent 7fa82136c5
commit d01e2d8238
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/controller/Article.php
View File

@ -663,6 +663,7 @@ class Article extends BaseController
$saohei = Db::table('fa_article')->alias('a')->join(['fa_article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 149)->count(); $saohei = Db::table('fa_article')->alias('a')->join(['fa_article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 149)->count();
$sos = Db::table('fa_article')->alias('a')->join(['fa_article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 150)->count(); $sos = Db::table('fa_article')->alias('a')->join(['fa_article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 150)->count();
$one_shuqiu = Db::table('fa_article')->alias('a')->join(['fa_article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 165)->count(); $one_shuqiu = Db::table('fa_article')->alias('a')->join(['fa_article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 165)->count();
$notice = Db::table('cms_notice')->where('status',1)->where('is_read',0)->count();
$select = [ $select = [
'yishi' => $yishi, 'yishi' => $yishi,
'maodun' => $maodun, 'maodun' => $maodun,
@ -670,6 +671,7 @@ class Article extends BaseController
'saohei' => $saohei, 'saohei' => $saohei,
'sos' => $sos, 'sos' => $sos,
'shuqiu' => $one_shuqiu, 'shuqiu' => $one_shuqiu,
'notice' => $notice,
]; ];
return $this->apiSuccess('ok', $select); return $this->apiSuccess('ok', $select);
} }

4
app/api/controller/Maintainentry.php
View File

@ -755,7 +755,7 @@ class Maintainentry extends BaseController
} }
} }
$waste_land_area = $post['land_area'] - $mianji; $waste_land_area = $post['land_area'] - $mianji - $post['breed_area'];
if($waste_land_area < 0){ if($waste_land_area < 0){
$waste_land_area = 0; $waste_land_area = 0;
} }
@ -1417,7 +1417,7 @@ class Maintainentry extends BaseController
} }
} }
$waste_land_area = $post['land_area'] - $mianji; $waste_land_area = $post['land_area'] - $mianji - $post['breed_area'];
if($waste_land_area < 0){ if($waste_land_area < 0){
$waste_land_area = 0; $waste_land_area = 0;
} }