展开默认角色

README.md

@@ -63,7 +63,6 @@ delete from bm_call_logs;<br>
 delete from bm_call_phone;<br>
 delete from bm_collections;<br>
 delete from bm_community_notice;<br>
-delete from bm_community_schedules;<br>
 delete from bm_coupon_distribution_list;<br>
 delete from bm_coupon_types;<br>
 delete from bm_coupons;<br>

app/Community/Actions/Docter/ChangeType.php

@@ -22,7 +22,11 @@ class ChangeType extends RowAction
 
     public function form(){
         //1.问诊医生 2.疫苗医生 3.儿保医生)
-        $type = $this->row->docter->type;
+        $type = 1;
+        if(!empty($this->row->docter)){
+            $type = $this->row->docter->type;
+        }
+
         $docterType = DocterType::where(['status'=>1])->pluck('name','id')->toArray();
         $this->select('type','类型')->options($docterType)->value(intval($type));
     }

app/Community/Controllers/DocterAccountController.php

@@ -50,9 +50,12 @@ class DocterAccountController extends  AdminController
             $reoute = request()->route()->parameters();
             $id = intval($reoute['docter_account']);
             $org_id = CdmsUsers::where(['id'=>$id])->value('org_id');
-            $form->multipleSelect('roles', trans('tenancy.roles'))->options($roleModel::where('org_id',$org_id)->get()->pluck('name', 'id'));
+            $ids = [0,$org_id];
+
+            $form->multipleSelect('roles', trans('tenancy.roles'))->options($roleModel::whereIn('org_id',$ids)->where('id','>',1)->get()->pluck('name', 'id'));
         } else {
-            $form->multipleSelect('roles', trans('tenancy.roles'))->options($roleModel::where('org_id',$org_id)->get()->pluck('name', 'id'));
+            $ids = [0,$org_id];
+            $form->multipleSelect('roles', trans('tenancy.roles'))->options($roleModel::whereIn('org_id',$ids)->where('id','>',1)->get()->pluck('name', 'id'));
         }
 
 //        $form->multipleSelect('roles', trans('tenancy.roles'))->options($roleModel::whereIn('name',['门诊医生','儿保医生','计免医生','图文咨询','所有医生'])->get()->pluck('name', 'id'));