ad

app/controller/User.php

@@ -359,4 +359,16 @@ class User extends Base
         $result=Db::name("account")->save($account);
         return $result?json_show(0,"密码修改成功"):json_show(1003,"密码修改失败");
    }
+   
+   public function AccountQuery(){
+   	$param = $this->request->only(['nickname' => '', 'username' => '',"is_wx"=>"",'level'=>'', 'status' => '', 'page'=> 1,'size'=>10], 'post', 'trim');
+   	    
+   	    $param['nickname']==''?? $where[]=['userinfo.nickname','like',"%{$param['nickname']}%"];
+    	$param['status']==''?? $where[]=['account.status','=',$param['status']];
+    	$param['level']==''?? $where[]=['account.level','=',$param['level']];
+    	$param['username']==''?? $where[]=['username','like',"%{$param['username']}%"];
+   	  $acc = $this->model->with(['userinfo'=>["nickname","mobile","openId"]])
+      ->where($where)->order('id desc')->paginate(['page'=>$param['page'],'list_rows'=>$param['size']]);
+   	  $this->success('获取成功',['list'=>$acc->items(),'count'=>$acc->total()]);
+   }
 }

app/middleware/CheckAuth.php

@@ -4,9 +4,6 @@ declare (strict_types = 1);
 namespace app\middleware;
 
 use think\facade\Db;
-
-use think\middleware\AllowCrossDomain;
-
 class CheckAuth
 {
 	protected $noCheck=[];

app/model/Account.php

@@ -14,7 +14,7 @@ class Account extends Model
 	public static $account_end=0;
 	public static $account_del=0;
 	protected $globalScope=['Del'];
-	protected $append=['depart_name','company_relaton'];
+	protected $append=['depart_name','company_relaton',"is_wx"];
 	
     public function scopeDel($query){
         $query->where('is_del',0);
@@ -39,7 +39,13 @@ class Account extends Model
     	return $this->belongsTo(AccountItem::class,'id','account_id');
 	}
 	
-	public function CompanyRelat(){
- 
+	public function getIsWxAttr($v,$row){
+		return $row['openId']==''?0:1;
+	}
+	
+	public function setIsWxAttr($v,$data){
+		if($v==0){
+			$this->UserInfo()->where('account_id',$data['id'])->update(['openId'=>'']);
+		}
 	}
 }

route/app.php

@@ -10,10 +10,11 @@
 // +----------------------------------------------------------------------
 use think\facade\Route;
 
-Route::rule('login', 'User/login')->crossDomainRule();
+Route::rule('login', 'User/login');
 Route::rule('verifyToken', 'User/verify_token');
 Route::rule('register', 'User/register');
 Route::rule('dingTalk', 'User/DingTalk');
+Route::rule('accountquery', 'User/AccountQuery');
 
 Route::rule('userlist', 'UserInfo/UserList');
 Route::rule('usersave', 'UserInfo/UserSave');
@@ -24,8 +25,6 @@ Route::rule('setcompany', 'UserInfo/setCompany');
 Route::rule('companystatus', 'UserInfo/setCompanyStatus');
 Route::rule('useradd', 'UserInfo/userAdd');
 Route::rule('userall', 'UserInfo/userAll');
-//Route::rule('add_admin_account', 'UserInfo/addAdminAccount');
-//Route::rule('add_supplier_account', 'UserInfo/addSupplierAccount');
 Route::rule('userDelete', 'UserInfo/userDelete');
 Route::rule('userlistbycompany', 'UserInfo/UserListByCompany');
 Route::rule('passSetByPassword', 'UserInfo/passSetByPassword');
@@ -93,5 +92,5 @@ Route::rule('ciinfo', 'CompanyItem/info');
 Route::rule('get_company_name_by_uid', 'CompanyItem/getCompanyNameByUid');//获取用户id对应的部门名称
 Route::rule('get_company_item_user_by_name', 'CompanyItem/getCompanyItemUserByName');//获取部门名称下的所有用户
 
-Route::rule("webAuth","WeChat/WebAuth")->crossDomainRule();
-Route::rule("getConfig","WeChat/getConfig")->crossDomainRule();
+Route::rule("webAuth","WeChat/WebAuth");
+Route::rule("getConfig","WeChat/getConfig");