|
@@ -1147,8 +1147,6 @@ class User extends BaseController
|
|
|
$post["pageSize"] = $post["pageSize"]>50 ? 50 : (int)$post["pageSize"];
|
|
$post["pageSize"] = $post["pageSize"]>50 ? 50 : (int)$post["pageSize"];
|
|
|
$post["page"] = $post["page"]<=0 ? 1 : (int)$post["page"];
|
|
$post["page"] = $post["page"]<=0 ? 1 : (int)$post["page"];
|
|
|
$where=[];
|
|
$where=[];
|
|
|
-
|
|
|
|
|
- $totalCount = (new UserContractRecordModel)->where($where)->count();
|
|
|
|
|
$uid = UtilService::getMore([
|
|
$uid = UtilService::getMore([
|
|
|
['uid', 0],
|
|
['uid', 0],
|
|
|
], $request);
|
|
], $request);
|
|
@@ -1158,6 +1156,12 @@ class User extends BaseController
|
|
|
if ($uid>0){
|
|
if ($uid>0){
|
|
|
$where[]=["uid","=",$uid];
|
|
$where[]=["uid","=",$uid];
|
|
|
}
|
|
}
|
|
|
|
|
+ $totalCount = (new UserContractRecordModel)->where($where)
|
|
|
|
|
+ ->where(function($query) use ($uid) {
|
|
|
|
|
+ $query->where('uid', $uid)
|
|
|
|
|
+ ->whereOr('to_uid', $uid);
|
|
|
|
|
+ })->count();
|
|
|
|
|
+
|
|
|
if ($post["status"]!=-2){
|
|
if ($post["status"]!=-2){
|
|
|
$where[]=['status','=',$post["status"]];
|
|
$where[]=['status','=',$post["status"]];
|
|
|
}
|
|
}
|
|
@@ -1172,7 +1176,7 @@ class User extends BaseController
|
|
|
->order("id", "desc")
|
|
->order("id", "desc")
|
|
|
->page($post["page"], $post["pageSize"])
|
|
->page($post["page"], $post["pageSize"])
|
|
|
->select();
|
|
->select();
|
|
|
-// var_dump((new UserContractRecordModel)->getLastSql());die();
|
|
|
|
|
|
|
+ var_dump((new UserContractRecordModel)->getLastSql());die();
|
|
|
foreach($data as $k=>$v){
|
|
foreach($data as $k=>$v){
|
|
|
$data[$k]["is_use"] = 1;//是否已经购买或者可以使用
|
|
$data[$k]["is_use"] = 1;//是否已经购买或者可以使用
|
|
|
switch ($data[$k]["status"]){
|
|
switch ($data[$k]["status"]){
|
