Kaynağa Gözat

Merge branch 'dev-sc-260204'

shichen 4 ay önce
ebeveyn
işleme
6830e20665
1 değiştirilmiş dosya ile 5 ekleme ve 2 silme
  1. 5 2
      app/controller/api/Auth.php

+ 5 - 2
app/controller/api/Auth.php

@@ -774,8 +774,11 @@ class Auth extends BaseController
774
         $data["is_merchant"]=$is_merchant===0||$is_merchant>0?$is_merchant:-1;
774
         $data["is_merchant"]=$is_merchant===0||$is_merchant>0?$is_merchant:-1;
775
         $data['phone1'] =substr($data['phone'], 0, 3) . '****' . substr($data['phone'], 7, 4);
775
         $data['phone1'] =substr($data['phone'], 0, 3) . '****' . substr($data['phone'], 7, 4);
776
         $data['longtime'] = intval((time()- strtotime($data['create_time'])) / 86400);
776
         $data['longtime'] = intval((time()- strtotime($data['create_time'])) / 86400);
777
-        $is_ertification=Db::name("user_certification")->where("uid",$user["uid"])->value("status");
778
-        $data["is_ertification"]=$is_ertification>0||$is_ertification===0?$is_ertification:-1;
777
+        $is_ertification = Db::name("user_certification")->where("uid", $user["uid"])->where(['status'=>1])->find();
778
+        if (!$is_ertification){
779
+            $is_ertification = -1;
780
+        }
781
+        $data["is_ertification"] = $is_ertification;
779
         $mer_staff=Db::name("store_staff")->where(["uid"=>$user["uid"]])->value("department");
782
         $mer_staff=Db::name("store_staff")->where(["uid"=>$user["uid"]])->value("department");
780
         $data["is_mer_staff"]=$mer_staff?explode(",",$mer_staff):0;
783
         $data["is_mer_staff"]=$mer_staff?explode(",",$mer_staff):0;
781
         $volunteer = Db::name("volunteer") -> where(["uid"=>$user["uid"]]) -> value("grade");
784
         $volunteer = Db::name("volunteer") -> where(["uid"=>$user["uid"]]) -> value("grade");