ad

app/controller/UserInfo.php

@@ -110,7 +110,7 @@ class UserInfo extends BaseController
     		'password|密码' => 'require|min:6|max:200',
             ]);
     	if($validate->check($post)==false) return json_show(1004,$validate->getError());
-        $account=Db::name("account")->where("id","=",$post['id'])->find();
+        $account=Db::name("account")->where([["id","=",$post['id']],["is_del","=","0"]])->find();
         if(empty($account)){
             return json_show(1003,"账户不存在");
         }
@@ -138,7 +138,7 @@ class UserInfo extends BaseController
 		$company_insert=[];
 		$acount =new AccountCompany();
     	 foreach ($post['company'] as $company){
-    	 	$ist=$acount->where(["account_id"=>$post['id'],"companyCode"=>$company['companyCode']])->find();
+    	 	$ist=$acount->where(["account_id"=>$post['id'],"companyCode"=>$company['companyCode'],"is_del"=>0])->find();
     	 	if($ist!=false)$company['id']=$ist['id'];
 			$company_insert[]=[
 				"id"=>$company['id']??null,
@@ -164,22 +164,22 @@ class UserInfo extends BaseController
 		* @throws \think\exception\DbException
 		 */
       public function setCompanyStatus(){
-    	$post = $this->request->only(["id"=>"","status"=>""],"post","intval");
+    	$post = $this->request->only(["account_id"=>"","companyCode"=>'',"status"=>""],"post");
     	 $validate=Validate::rule([
-    		'id|主键ID' => 'require|number|gt:0',
+    		'account_id|账户id' => 'require|number|gt:0',
     		'status|状态' => 'require|number|in:0,1',
+    		'companyCode|公司编号' => 'require',
             ]);
     	 if($validate->check($post)==false) return json_show(1004,$validate->getError());
-    	 $info=AccountCompany::where(["id"=>$post['id']])->find();
-    	 if($info==false){
-    	 	return json_show(1004,"未找到数据");
-    	 }
-    	 if($info['status']==$post['status']){
-    	 	return json_show(1004,"数据已更新");
+    	 $acc = new AccountCompany();
+    	 $info= $acc->where(["account_id"=>$post['account_id'],"companyCode"=>$post['companyCode'],"is_del"=>0])
+			     ->findOrEmpty();
+    	 if($info->isEmpty()){
+    	 	return json_show(1004,"未找账户到数据");
     	 }
-    	 $info['status']=$post['status'];
-    	 $info['updatetime']=date("Y-m-d H:i:s");
-    	 $inser=AccountCompany::update($info->toArray());
+    	 if($info['is_main']==1) return json_show(1004,"默认企业不可禁用");
+    	 $upda=["status"=>$post['status'],"updatetime"=>date("Y-m-d H:i:s")];
+    	 $inser=$acc->update($upda,["account_id"=>$post['account_id'],"companyCode"=>$post['companyCode'],"is_del"=>0]);
     	 return $inser?json_show(0,"关联企业状态设置成功"):json_show(1005,"关联企业状态设置失败");
     }
 		/**