ad

app/bug/controller/Role.php

@@ -172,7 +172,7 @@ class Role extends Base
 					if($acStatus==false)throw new \Exception( $statusCn.'失败');
             }
     
-           $this->model->commit();
+            $this->model->commit();
             return success($statusCn.'成功');
         }catch (\Exception $e){
             $this->model->rollback();

app/bug/controller/WorkRole.php

@@ -71,6 +71,7 @@ class WorkRole extends Base{
         $info->work_id= $param['work_id'];
         $info->belong= $template->belong;
         $info->action= $param['action'];
+        $info->status= 0;
         $add= $info->save();
         return $add ? success('岗位角色修改成功'):error('岗位角色修改失败');
 	}
@@ -94,7 +95,9 @@ class WorkRole extends Base{
 		$info->status=$param['status'];
 		$add = $info->save();
 		$messg= \app\bug\model\WorkRole::$statusCn[$param['status']];
-		return $add ? success("岗位角色{$messg}成功"):error("岗位角色{$messg}失败");
+		if($add==false)return error("岗位角色{$messg}失败");
+        event('role_sync',$info);
+		return success("岗位角色{$messg}成功");
 	}
 	public function  delete(){
 		$id = $this->request->post('id/d');
@@ -103,7 +106,9 @@ class WorkRole extends Base{
         $user = WorkUser::where(["role_id"=>$id])->findOrEmpty();
         if($user->isEmpty()==false)return error('岗位角色有账户正在使用无法删除');
         $delete = $info->delete();
-        return $delete ? success('删除成功'):error('删除失败');
+        if($delete==false)return error('删除失败');
+         event('role_sync',$info,"delete");
+        return success('删除成功');
 	}
 	
 	public function  list(){

app/event.php

@@ -1,5 +1,6 @@
 <?php
 // 事件定义文件
+
 return [
     'bind'      => [
     ],
@@ -10,6 +11,8 @@ return [
         'HttpEnd'  => [],
         'LogLevel' => [],
         'LogWrite' => [],
+        "role_sync"=>app\bug\listener\RoleEvent::class,
+        "user_sync"=>app\bug\listener\UserEvent::class,
     ],
 
     'subscribe' => [

app/user/controller/User.php

@@ -21,10 +21,13 @@ class User extends Base
         	'nickname|账户名称'=>'require|max:255',
         	'username|账户手机号'=>'require|mobile|unique:app\user\model\Account,username^is_del',
         	'level|账户级别'=>'require|number|in:1,2,3',
-        	'companyArr|账户关联公司'=>'require|array',
+        	'companyArr|账户关联公司'=>'array',
         	'field_deny|可查看字段'=>'require|array',
         	]);
     if($valid->check($param)==false)return error($valid->getError());
+    if(in_array($param['level'],[2,3])&& empty($param['companyArr'])){
+        return error("请选择关联公司");
+    }
     $salt=Str::random(8,1);
     $password = Str::substr($param['username'], 5,  6);
     $password = "dingding123";
@@ -94,6 +97,9 @@ class User extends Base
         	]);
     if($valid->check($param)==false)return error($valid->getError());
     $Account =Account::with(["userInfo"])->findOrEmpty($param['id']);
+    if(in_array($param['level'],[2,3])&& empty($param['companyArr'])){
+        return error('请选择关联公司');
+    }
     $salt=Str::random(8,1);
     $password = Str::substr($param['username'], 5,  6);
     $password='dingding123';