From bf147e157025c4701a506eebfacad8cc8cd1a3dc Mon Sep 17 00:00:00 2001
From: liuyi <liuyi@ddkids.com>
Date: Wed, 13 May 2020 02:17:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8PHP7.4=E4=BB=A5?=
 =?UTF-8?q?=E4=B8=8A=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=8E=88=E6=9D=83=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E5=9C=A8=E4=BA=8E=EF=BC=9AUnparenthesized=20?=
 =?UTF-8?q?a=20=3F=20b=20:=20c=20=3F=20d=20:=20eis=20deprecated.=20Use=20e?=
 =?UTF-8?q?ither(a=20=3F=20b=20:=20c)=20=3F=20d=20:=20eora=20=3F=20b=20:?=
 =?UTF-8?q?=20(c=20=3F=20d=20:=20e)``=20=E5=B7=B2=E7=BB=8F=E6=AD=A3?=
 =?UTF-8?q?=E5=88=99=E5=8C=B9=E9=85=8D=E6=9F=A5=E8=AF=A2=E8=BF=87applicati?=
 =?UTF-8?q?on=E4=B8=8B=E6=89=80=E6=9C=89=E6=96=87=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=85=E5=8F=91=E7=8E=B0=E8=BF=99=E4=B8=AA=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=9C=89=E8=BF=99=E4=B8=AA=E8=A2=AB=E5=BC=83=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E5=86=99=E6=B3=95=EF=BC=8C=E5=B7=B2=E7=BB=8F=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=8C=E9=80=9A=E8=BF=87=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E6=8E=88=E6=9D=83=E4=BA=86?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/User.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 21db0f70d..e1b39767e 100755
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -139,7 +139,7 @@ class User extends Common
         if(empty($user))
         {
             $this->data_post['nick_name'] = isset($this->data_post['nickName']) ? $this->data_post['nickName'] : '';
-            $this->data_post['gender'] = empty($this->data_post['gender']) ? 0 : ($this->data_post['gender'] == 'f') ? 1 : 2;
+            $this->data_post['gender'] = empty($this->data_post['gender']) ? 0 : (($this->data_post['gender'] == 'f') ? 1 : 2);
             return UserService::AuthUserProgram($this->data_post, 'alipay_openid');
         } else {
             return DataReturn('授权成功', 0, $user);
@@ -225,7 +225,7 @@ class User extends Common
             {
                 $result['nick_name'] = isset($result['nickName']) ? $result['nickName'] : '';
                 $result['avatar'] = isset($result['avatarUrl']) ? $result['avatarUrl'] : '';
-                $result['gender'] = empty($result['gender']) ? 0 : ($result['gender'] == 2) ? 1 : 2;
+                $result['gender'] = empty($result['gender']) ? 0 : (($result['gender'] == 2) ? 1 : 2);
                 $result['weixin_unionid'] = isset($result['unionId']) ? $result['unionId'] : '';
                 $result['openid'] = $result['openId'];
                 $result['referrer']= isset($this->data_post['referrer']) ? $this->data_post['referrer'] : 0;
@@ -318,7 +318,7 @@ class User extends Common
             {
                 $result['nick_name'] = isset($result['data']['nickname']) ? $result['data']['nickname'] : '';
                 $result['avatar'] = isset($result['data']['headimgurl']) ? $result['data']['headimgurl'] : '';
-                $result['gender'] = empty($result['data']['sex']) ? 0 : ($result['data']['sex'] == 2) ? 1 : 2;
+                $result['gender'] = empty($result['data']['sex']) ? 0 : (($result['data']['sex'] == 2) ? 1 : 2);
                 $result['openid'] = $result['data']['openid'];
                 $result['referrer']= isset($this->data_post['referrer']) ? $this->data_post['referrer'] : 0;
                 return UserService::AuthUserProgram($result, 'baidu_openid');
@@ -400,7 +400,7 @@ class User extends Common
             {
                 $result['nick_name'] = isset($result['nickName']) ? $result['nickName'] : '';
                 $result['avatar'] = isset($result['avatarUrl']) ? $result['avatarUrl'] : '';
-                $result['gender'] = empty($result['gender']) ? 0 : ($result['gender'] == 2) ? 1 : 2;
+                $result['gender'] = empty($result['gender']) ? 0 : (($result['gender'] == 2) ? 1 : 2);
                 $result['openid'] = $this->data_post['openid'];
                 $result['referrer']= isset($this->data_post['referrer']) ? $this->data_post['referrer'] : 0;
                 return UserService::AuthUserProgram($result, 'toutiao_openid');
@@ -488,7 +488,7 @@ class User extends Common
             {
                 $result['nick_name'] = isset($result['nickName']) ? $result['nickName'] : '';
                 $result['avatar'] = isset($result['avatarUrl']) ? $result['avatarUrl'] : '';
-                $result['gender'] = empty($result['gender']) ? 0 : ($result['gender'] == 2) ? 1 : 2;
+                $result['gender'] = empty($result['gender']) ? 0 : (($result['gender'] == 2) ? 1 : 2);
                 $result['qq_unionid'] = isset($result['unionId']) ? $result['unionId'] : '';
                 $result['openid'] = $result['openId'];
                 $result['referrer']= isset($this->data_post['referrer']) ? $this->data_post['referrer'] : 0;