增加合同到期待变更提醒

app/enterprise/controller/TalentBasicChange.php

@@ -338,19 +338,21 @@ class TalentBasicChange extends EnterpriseController {
         if (session("user")["usertype"] == 2) {
             $where[] = ["ti.enterprise_id", "=", session("user")["uid"]];
         }
+
         if ($name) {
             $where[] = ["ti.name", "like", "%" . $name . "%"];
         }
         if ($idCard) {
             $where[] = ["ti.card_number", "like", "%" . $idCard . "%"];
         }
+        //dump($where);die;
 
         $now = date("Y-m-d",time());
         //$where[] = ["trim(SUBSTRING_INDEX(ti.labor_contract_rangetime,'-',-3))", "<", $now];
 
 
         $count = Talent::alias("ti")->field("ti.id,ti.name,ti.card_number,ti.labor_contract_rangetime")->leftJoin("un_talent_basic_change tbc","ti.id = tbc.talentId")->where($where)->whereRaw("trim(SUBSTRING_INDEX(ti.labor_contract_rangetime,'-',-3)) < '{$now}'")->count();
-        $list = Talent::alias("ti")->field("ti.id,ti.name,ti.card_number,ti.labor_contract_rangetime")->leftJoin("un_talent_basic_change tbc","ti.id = tbc.talentId")->whereRaw("trim(SUBSTRING_INDEX(ti.labor_contract_rangetime,'-',-3)) < '{$now}'")->limit($offset, $limit)->select()->toArray();
+        $list = Talent::alias("ti")->field("ti.id,ti.name,ti.card_number,ti.labor_contract_rangetime")->leftJoin("un_talent_basic_change tbc","ti.id = tbc.talentId")->where($where)->whereRaw("trim(SUBSTRING_INDEX(ti.labor_contract_rangetime,'-',-3)) < '{$now}'")->limit($offset, $limit)->select()->toArray();
         //echo Talent::getLastSql();die;
 
         return json(["total" => $count, "rows" => $list]);