liugc 1 рік тому
батько
коміт
a7f1472647
1 змінених файлів з 3 додано та 1 видалено
  1. 3 1
      app/api/lists/UserEquityLists.php

+ 3 - 1
app/api/lists/UserEquityLists.php

@@ -1,6 +1,7 @@
 <?php
 <?php
 namespace app\api\lists;
 namespace app\api\lists;
 
 
+use app\common\model\equity\EquityConfig;
 use app\common\model\equity\UserEquity;
 use app\common\model\equity\UserEquity;
 
 
 class UserEquityLists  extends BaseApiDataLists
 class UserEquityLists  extends BaseApiDataLists
@@ -11,7 +12,8 @@ class UserEquityLists  extends BaseApiDataLists
        $where[] = ['user_id','=',$this->userId];
        $where[] = ['user_id','=',$this->userId];
        $where[] = ['number','>',0];
        $where[] = ['number','>',0];
        $where[] = ['end_time','>=',time()];
        $where[] = ['end_time','>=',time()];
-
+       $equityConfigIds = EquityConfig::where('status',1)->column('id')??[-1];
+       $where[] = ['equity_id','in',$equityConfigIds];
        if(isset($this->params['goods_id']) && !empty($this->params['goods_id'])){
        if(isset($this->params['goods_id']) && !empty($this->params['goods_id'])){
            $where[] = ['goods_id','=',$this->params['goods_id']];
            $where[] = ['goods_id','=',$this->params['goods_id']];
        }
        }