|
|
@@ -20,34 +20,34 @@ class UserNotice extends BaseModel
|
|
|
{
|
|
|
use ModelTrait;
|
|
|
public static function getNotice($uid){
|
|
|
- $count_notice = self::where('uid','like',"%,$uid,%")->where("is_send",1)->count();
|
|
|
- $see_notice = UserNoticeSee::where("uid",$uid)->count();
|
|
|
+ $count_notice = self::whereIn('uid', [$uid, 0])->where("is_send",1)->count();
|
|
|
+ $see_notice = UserNoticeSee::where("uid", $uid)->count();
|
|
|
return $count_notice-$see_notice;
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* @return array
|
|
|
*/
|
|
|
- public static function getNoticeList($uid,$page,$limit = 8){
|
|
|
- //定义分页信息
|
|
|
- $count = self::where('uid','like',"%,$uid,%")->count();
|
|
|
- $data["lastpage"] = ceil($count/$limit) <= ($page+1) ? 1 : 0;
|
|
|
+ public static function getNoticeList($uid, $page, $limit = 8){
|
|
|
+ $list = self::whereIn('uid', [$uid,0])
|
|
|
+ ->where('is_send', 1)
|
|
|
+ ->field('id,user,title,content,add_time')
|
|
|
+ ->order("add_time desc")
|
|
|
+ ->limit($page*$limit,$limit)->select()->toArray();
|
|
|
|
|
|
- $where['uid'] = array("like","%,$uid,%");
|
|
|
-// $where['uid'] = array(array("like","%,$uid,%"),array("eq",""), 'or');
|
|
|
- $where['is_send'] = 1;
|
|
|
- $list = self::where($where)->field('id,user,title,content,add_time')->order("add_time desc")->limit($page*$limit,$limit)->select()->toArray();
|
|
|
foreach ($list as $key => $value) {
|
|
|
$list[$key]["add_time"] = date("Y-m-d H:i:s",$value["add_time"]);
|
|
|
- $list[$key]["is_see"] = UserNoticeSee::where("uid",$uid)->where("nid",$value["id"])->count() > 0 ? 1 : 0;
|
|
|
+ $list[$key]["is_see"] = 0; //UserNoticeSee::where("uid",$uid)->where("nid",$value["id"])->count() > 0 ? 1 : 0;
|
|
|
}
|
|
|
$data["list"] = $list;
|
|
|
return $data;
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* @return array
|
|
|
*/
|
|
|
- public static function seeNotice($uid,$nid){
|
|
|
- if(UserNoticeSee::where("uid",$uid)->where("nid",$nid)->count() <= 0){
|
|
|
+ public static function seeNotice($uid, $nid){
|
|
|
+ if(UserNoticeSee::where("uid", $uid)->where("nid", $nid)->count() <= 0){
|
|
|
$data["nid"] = $nid;
|
|
|
$data["uid"] = $uid;
|
|
|
$data["add_time"] = time();
|