|  | @@ -302,10 +302,11 @@ class Eggnew extends Api
 | 
											
												
													
														|  |          $today = strtotime(date("Y-m-d"));
 |  |          $today = strtotime(date("Y-m-d"));
 | 
											
												
													
														|  |          $where = [];
 |  |          $where = [];
 | 
											
												
													
														|  |          $where["a.createtime"] = ["gt",$today];
 |  |          $where["a.createtime"] = ["gt",$today];
 | 
											
												
													
														|  | -        $where["a.type"] = $type;
 |  | 
 | 
											
												
													
														|  | 
 |  | +        $where["jp.type"] = $type;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |          $ranklist = \app\common\model\EggDo::alias("a")->field("a.user_id,a.image,a.price as money,a.createtime,u.nickname")
 |  |          $ranklist = \app\common\model\EggDo::alias("a")->field("a.user_id,a.image,a.price as money,a.createtime,u.nickname")
 | 
											
												
													
														|  |              ->join("hx_user u","u.id = a.user_id","left")
 |  |              ->join("hx_user u","u.id = a.user_id","left")
 | 
											
												
													
														|  | 
 |  | +            ->join("egg_jackpot jp","a.Jackpot_id = jp.id","left")
 | 
											
												
													
														|  |              ->where($where)
 |  |              ->where($where)
 | 
											
												
													
														|  |  //            ->group("a.user_id")
 |  |  //            ->group("a.user_id")
 | 
											
												
													
														|  |              ->order("money","desc")
 |  |              ->order("money","desc")
 |