superbee 7 rokov pred
rodič
commit
19e9119412

+ 9 - 0
application/newhome/controller/Buddy.php

@@ -24,6 +24,15 @@ class Buddy extends Controller{
 		return json(['l'=>$res]);
 	}
 	
+	public function list(){
+		$data = decode($this->request->post());
+		$user = $data['u'];
+		
+		$res = $this->buddyModel->findUserBuddy($user, UserBuddy::Apply);
+		
+		return json(['l'=>$res]);
+	}
+	
 	public function apply(){
 		$data = decode($this->request->post());
 		

+ 2 - 2
application/user/model/UserBuddy.php

@@ -12,11 +12,11 @@ class UserBuddy extends Model {
 	 * @param int $user
 	 * @return array|\think\db\false|PDOStatement|string|\think\Model
 	 */
-	public function findUserBuddy($user){
+	public function findUserBuddy($user, $status = UserBuddy::Friend){
 		return $this->db()->alias("b")
 		->field("u.id i, u.nickname n, u.praise p, u.robot r")
 		->join("gd_user u", "u.id = b.user_id", "LEFT")
-		->where(['b.user_id'=>$user, 'b.status'=>Friend])
+		->where(['b.user_id'=>$user, 'b.status'=>$status])
 		->select();
 	}