wugg 2 年之前
父节点
当前提交
1db343c7e3
共有 2 个文件被更改,包括 23 次插入21 次删除
  1. 8 21
      app/admin/controller/User.php
  2. 15 0
      app/common.php

+ 8 - 21
app/admin/controller/User.php

@@ -120,7 +120,7 @@ class User extends BaseController{
         ->where(["uid"=>$value['id'],"a.companyNo"=>$value['companyCode'],"is_del"=>0])
         ->field("role_name,roleid,a.status,b.level")->findOrEmpty();
             $value['roleid']=$roleArr['roleid']??"";
-            $value['status']=$roleArr['status']??0;
+            $value['status']=$value['status']==1?($roleArr['status']??0) :0;
             $value["role_name"] =$roleArr['role_name']??"";
             $value["role_level"] =$roleArr['level']??"";
             $list[]=$value;
@@ -236,7 +236,7 @@ class User extends BaseController{
 		* @throws \think\db\exception\DbException
 		* @throws \think\db\exception\ModelNotFoundException
 		*/
-		public function setStatus(){
+	public function setStatus(){
 	        $post =$this->request->only(["id"=>"","status"=>"","relaComNo"=>"","companyNo"=>"","token"=>""],"post");
 	        $valide =Validate::rule([
 	            'id|账户ID' => 'require|number|gt:0',
@@ -246,25 +246,12 @@ class User extends BaseController{
 	            ]);
 	        if($valide->check($post)==false) return error_show(1004,$valide->getError());
 	        $message = $post['status']==1?"启用":"禁用";
-	           if($this->level==1){
-        	        $companyNo =  isset($post['companyNo'])&&$post['companyNo']!=='' ? trim($post['companyNo']) :"";
-				}else{
-				     $companyNo =  isset($post['relaComNo'])&&$post['relaComNo']!=='' ? trim($post['relaComNo']) :"";
-				}
-	        $userinfo =Db::name("user_role")->where(["uid"=>$post['id'],"companyNo"=>$companyNo,"is_del"=>0])
-	        ->find();
-	        if($userinfo==false){
-	            return error_show(1005,"未找到有关账户信息");
-	        }else{
-	            $userinfo['status']=$post['status'];
-	            $userinfo['updatetime']=date("Y-m-d H:i:s");
-	            $sa=Db::name("user_role")->save($userinfo);
-	        }
-	       if($sa==false){
-	            return error_show(1005,"{$message}失败");
-	        }else{
-	            return app_show(0,"{$message}成功");
-	        }
+	        $condition=["id"=>$post['id'],"status"=>$post['status'],"token"=>$post['token']];
+	        $ex=setStatus($condition);
+	        if(!isset($ex['code'])||$ex['code']!=0){
+				return error_show(1004,$ex['message']);
+		    }
+		return app_show(0,"{$message}成功");
     }
 
   //获取所有用户的信息

+ 15 - 0
app/common.php

@@ -35,6 +35,21 @@ function setUserCompany($condition){
     return json_decode($response,true);
 }
 
+
+function seCompanyStatus($condition){
+    $host = Config::get("app");
+    $url = $host["api_host"]."/companystatus";
+    $response=curl_request($url,$condition);
+
+    return json_decode($response,true);
+}
+function setStatus($condition){
+    $host = Config::get("app");
+    $url = $host["api_host"]."/userstatus";
+    $response=curl_request($url,$condition);
+    return json_decode($response,true);
+}
+
 /**手机号验证
  * @param $mobile
  * @return bool