|
|
@@ -31,10 +31,25 @@ class Share extends BaseController
|
|
|
$size = isset($post['size']) ? intval($post['size']):10;
|
|
|
$condition=[];
|
|
|
$condition[]=["is_del","=",0];
|
|
|
+ $source_uname = isset($post['source_uname'])&&$post['source_uname']!='' ? trim($post['source_uname']) :"";
|
|
|
+ if($source_uname!=''){
|
|
|
+ $uid =Db::name("depart_user")->where([["nickname","like","%$source_uname%"],["is_del","=",0]])->column("uid");
|
|
|
+ $condition[]=["share_user","in",$uid];
|
|
|
+ }
|
|
|
+ $to_uname = isset($post['to_uname'])&&$post['to_uname']!='' ? trim($post['to_uname']) :"";
|
|
|
+ if($to_uname!=''){
|
|
|
+ $uid =Db::name("depart_user")->where([["nickname","like","%$to_uname%"],["is_del","=",0]])->column("uid");
|
|
|
+ $condition[]=["to_user","in",$uid];
|
|
|
+ }
|
|
|
+ $group_name = isset($post['group_name'])&&$post['group_name']!='' ? trim($post['group_name']) :"";
|
|
|
+ if($group_name!=''){
|
|
|
+ $uid =Db::name("role_group")->where([["group_name","like","%$group_name%"],["is_del","=",0]])->column("id");
|
|
|
+ $condition[]=["to_group","in",$uid];
|
|
|
+ }
|
|
|
$count =Db::name("role_share")->where($condition)->count();
|
|
|
$total = ceil($count/$size)>1 ? ceil($count/$size) : 1;
|
|
|
$page = $page>=$total?intval($total):$page;
|
|
|
- $list = Db::name("role_share")->where($condition)->page($page,$size)->select();
|
|
|
+ $list = Db::name("role_share")->where($condition)->page($page,$size)->order("id desc")->select();
|
|
|
$result = [];
|
|
|
foreach ($list as $key=>$val){
|
|
|
$temp = [];
|
