|
@@ -1164,14 +1164,10 @@ class User extends BaseController
|
|
|
$data=null;
|
|
$data=null;
|
|
|
if($totalCount>0){
|
|
if($totalCount>0){
|
|
|
$data = (new UserContractRecordModel)
|
|
$data = (new UserContractRecordModel)
|
|
|
-// ->field("")
|
|
|
|
|
-// ->alias("ut")
|
|
|
|
|
-// ->join("show_template t", "t.id = show_template_id","left")
|
|
|
|
|
->where($where)
|
|
->where($where)
|
|
|
-// ->order("is_default", "desc")
|
|
|
|
|
->where(function($query) use ($uid) {
|
|
->where(function($query) use ($uid) {
|
|
|
$query->where('uid', $uid)
|
|
$query->where('uid', $uid)
|
|
|
- ->orWhere('to_uid', $uid);
|
|
|
|
|
|
|
+ ->whereOr('to_uid', $uid);
|
|
|
})
|
|
})
|
|
|
->order("id", "desc")
|
|
->order("id", "desc")
|
|
|
->page($post["page"], $post["pageSize"])
|
|
->page($post["page"], $post["pageSize"])
|
