|
@@ -1146,8 +1146,11 @@ 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=[];
|
|
|
- $where[]=["uid","=",$request->user["uid"]];
|
|
|
|
|
|
|
+
|
|
|
$totalCount = (new UserContractRecordModel)->where($where)->count();
|
|
$totalCount = (new UserContractRecordModel)->where($where)->count();
|
|
|
|
|
+ if (!empty($request->user["uid"])){
|
|
|
|
|
+ $where[]=["uid","=",$request->user["uid"]];
|
|
|
|
|
+ }
|
|
|
if ($post["status"]!=-2){
|
|
if ($post["status"]!=-2){
|
|
|
$where[]=['status','=',$post["status"]];
|
|
$where[]=['status','=',$post["status"]];
|
|
|
}
|
|
}
|
|
@@ -1162,7 +1165,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"]){
|
