|
@@ -84,7 +84,12 @@ class NoticeController extends Controller
|
|
public function get_system_message(Request $request){
|
|
public function get_system_message(Request $request){
|
|
try {
|
|
try {
|
|
$user = auth('api')->user();
|
|
$user = auth('api')->user();
|
|
- $res =UserSystemMessageModel::query()->where(['user_id'=>$user->id,'is_delete'=>0])->orderByDesc('id')->paginate(request("perPage",20));
|
|
|
|
|
|
+ $res =UserSystemMessageModel::query()
|
|
|
|
+ ->where(['user_id'=>$user->id,'is_delete'=>0])
|
|
|
|
+ ->leftJoin('notice','users_system_message.msg_id','=','notice.id')
|
|
|
|
+ ->select(['users_system_message.*','notice.title','notice.content'])
|
|
|
|
+ ->orderByDesc('id')
|
|
|
|
+ ->paginate(request("perPage",20));
|
|
//清除未读状态
|
|
//清除未读状态
|
|
UserSystemMessageModel::query()->where(['user_id'=>$user->id,'status'=>0])->update(['status'=>1]);
|
|
UserSystemMessageModel::query()->where(['user_id'=>$user->id,'status'=>0])->update(['status'=>1]);
|
|
} catch (\Exception $exception){
|
|
} catch (\Exception $exception){
|