From 6be570d36d47e7c85f7ba3bf9415a02f4fe341d5 Mon Sep 17 00:00:00 2001
From: "yangsai@163.com" <2624183217@qq.com>
Date: Tue, 28 May 2024 11:51:21 +0800
Subject: [PATCH] ys

---
 application/controllers/Api/Squirrel.php | 4 ++--
 application/models/Squirrel.php          | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/application/controllers/Api/Squirrel.php b/application/controllers/Api/Squirrel.php
index 4bb4187..36530c4 100644
--- a/application/controllers/Api/Squirrel.php
+++ b/application/controllers/Api/Squirrel.php
@@ -117,7 +117,7 @@ class Api_SquirrelController extends Ctrl_Api{
         $data['dose_time'] = date("Y-m-d",strtotime("+{$squirrelSet['dose_time']} day",strtotime($data['birthday'])));
         //查询笼位类型
         $cageinfo = $this->CageModel->field("type")->where("id={$data['cage']}")->fRow();
-        if($cageinfo==2){
+        if($cageinfo['type']==2){
             if($data['sex']==1){
                 if((int)$this->Squirrelmodel->field("count(*) num")->where("sex=1 and cage={$data['cage']}")->fList()['num']==1) Tool_Fnc::apiMsg('该笼公鼠已上限', '500');
             }if($data['sex']==2){
@@ -183,7 +183,7 @@ class Api_SquirrelController extends Ctrl_Api{
         $data['created'] = date('Y-m-d H:i:s',time());
         $squirrelinfo = $this->Squirrelmodel->field("*")->where("id={$data['id']}")->fRow();
         $cageinfo = $this->CageModel->field("type")->where("id={$squirrelinfo['cage']}")->fRow();
-        if($cageinfo==2){
+        if($cageinfo['type']==2){
             if($data['sex']==1){
                 if((int)$this->Squirrelmodel->field("count(*) num")->where("sex=1 and cage={$data['cage']}")->fList()['num']==1) Tool_Fnc::apiMsg('该笼公鼠已上限', '500');
             }if($data['sex']==2){
diff --git a/application/models/Squirrel.php b/application/models/Squirrel.php
index 9b86082..f5e8113 100644
--- a/application/models/Squirrel.php
+++ b/application/models/Squirrel.php
@@ -79,9 +79,16 @@ class SquirrelModel extends Orm_Base{
     }
     public function partent($cage){
         $time = date('Y-m-d',time());
+
         $exec=$this->field('id,number,sex')->where("is_delete=0 and is_kill=0 and grow_time<'{$time}'");
-        if(!empty($cage))$exec->where("cage={$cage}");
+        if(!empty($cage)){
+            $CageModel = new CageModel();
+            $cageinfo = $CageModel->field("type")->where("id={$cage}")->fRow();
+            if($cageinfo['type']==2) $exec->where("cage={$cage}");
+        }
         $data = $exec->fList();
+        $data[] = ['id'=>0,number=>"暂无",'sex'=>2];
+        $data[] = ['id'=>0,number=>"暂无",'sex'=>1];
         return $data;
     }
     public function getIcon($squirrel){