初始化

addons/qingdong/model/Staff.php

@@ -7,6 +7,7 @@ use app\admin\controller\qingdong\Base;
 use app\admin\library\Auth;
 use app\admin\model\AuthGroup;
 use app\admin\model\AuthGroupAccess;
+use app\admin\model\MemberGroup;
 use app\admin\model\MemberGroupAccess;
 use think\Db;
 use think\Model;
@@ -224,7 +225,7 @@ class Staff Extends Model {
         if(!is_array($l_ids)){
             $l_ids=explode(',',$l_ids);
         }
-        $ids=AuthGroup::where(['pid' =>['in',$l_ids]])->column('id');
+        $ids=MemberGroup::where(['pid' =>['in',$l_ids]])->column('id');
         if ($ids) {
             $w_ids = self::getLowerId($ids,false);
             $ids   = array_merge($ids, $w_ids);
@@ -256,7 +257,7 @@ class Staff Extends Model {
             case 3://本部门
                 $uids = MemberGroupAccess::where(['group_id' => ['in', $groupIds]])->column('uid');
                 $l_ids = self::where([
-                    'id' => ['in', $uids],
+                    'id' => ['admin_id', $uids],
                     'status' => 1,
 //                    'id' => ['neq', $staff->id]
                 ])->column('id');
@@ -265,7 +266,7 @@ class Staff Extends Model {
                 $groupIds = self::getLowerId($groupIds, false);
                 $uids = MemberGroupAccess::where(['group_id' => ['in', $groupIds]])->column('uid');
                 $l_ids = self::where([
-                    'id' => ['in', $uids],
+                    'admin_id' => ['in', $uids],
                     'status' => 1,
 //                    'id' => ['neq', $staff->id]
                 ])->column('id');
@@ -274,13 +275,18 @@ class Staff Extends Model {
                 $groupIds = self::getLowerId($groupIds, true);
                 $uids = MemberGroupAccess::where(['group_id' => ['in', $groupIds]])->column('uid');
                 $l_ids = self::where([
-                    'id' => ['in', $uids],
+                    'admin_id' => ['in', $uids],
                     'status' => 1,
 //                    'id' => ['neq', $staff->id]
                 ])->column('id');
                 break;
             case 6://全部
-                $l_ids = Db::where("member_company")->where("cid",CID)->where( 'uid','neq',$staff->id)->column("uid");
+                $uids = Db::where("member_company")->where("cid",CID)->where( 'uid','neq',$staff->id)->column("uid");
+                $l_ids = self::where([
+                    'admin_id' => ['in', $uids],
+                    'status' => 1,
+//                    'id' => ['neq', $staff->id]
+                ])->column('id');
 //                $l_ids = self::where([
 //                    'cid'=>CID,
 //                    'status' => 1,

application/admin/controller/qingdong/department/Staff.php

@@ -9,6 +9,7 @@ use app\admin\model\AuthGroup;
 use app\admin\controller\qingdong\Base;
 use app\admin\model\MemberCompany;
 use app\admin\model\MemberGroup;
+use app\admin\model\MemberGroupAccess;
 use fast\Tree;
 use think\Db;
 use think\Exception;
@@ -118,9 +119,15 @@ class Staff extends  Base {
                     $data['admin_id'] = $admin['id'];
                 }
                 $result =  $this->model->save($data);
+                $staffId = $this->model->getLastInsID();
 
+                $admin = Admin::where(['username'=>$mobile])->find();
                 if($admin){
+                    //当前表再次同步下admin_id
                     $userId = $admin['id'];
+                    $this->model->save(['admin_id'=>$userId],['id'=>$staffId]);
+
+                    //同步企业数据
                     $memberUserCount = MemberCompany::where(['uid'=>$userId,'cid'=>CID])->count();
                     if($memberUserCount == 0){
                         $memberCompany = [
@@ -132,9 +139,22 @@ class Staff extends  Base {
                         $memberCompanym = new  MemberCompany();
                         $memberCompanym->save($memberCompany);
                     }
+
+                    //同步权限数据
+                    foreach ($group as $gid){
+                        $staffGroupData = [
+                            'uid' => $userId,
+                            'cid' => CID,
+                            'group_id' => $gid
+                        ];
+                        $memberGroupAccess = new  MemberGroupAccess();
+                        $memberGroupAccess->save($staffGroupData);
+                    }
+
                 }
                 Db::commit();
             }catch (Exception $e){
+                var_dump($e);
                 Db::rollback();
                 $this->error($e->getMessage());
             }
@@ -193,6 +213,31 @@ class Staff extends  Base {
                 $data['group_ids']=implode(',',$group);
                 $data['id']=$map['id'];
                 $result=$this->model->save($data,$map);
+
+                $admin = Admin::where(['username'=>$mobile])->find();
+                if($admin){
+
+                    $userId = $admin['id'];
+
+                    //当前表再次同步下admin_id
+                    $nowData = StaffModel::where(['mobile'=>$mobile,'id'=>['neq',$ids],'CID'=>CID])->count();
+                    if(!$nowData['admin_id']){
+                        $this->model->save(['admin_id'=>$userId],['id'=>$map['id']]);
+                    }
+
+                    //删除现有权限 重新添加权限
+                    $memberGroupAccess = new  MemberGroupAccess();
+                    $memberGroupAccess->where('uid','=',$userId)->delete();
+                    //同步权限数据
+                    foreach ($group as $gid){
+                        $staffGroupData = [
+                            'uid' => $userId,
+                            'cid' => CID,
+                            'group_id' => $gid
+                        ];
+                        $memberGroupAccess->save($staffGroupData);
+                    }
+                }
                 Db::commit();
             }catch (Exception $e){
                 Db::rollback();

application/admin/library/Auth.php

@@ -410,7 +410,7 @@ class Auth extends \fast\Auth
             }
         }
 
-        if($v['uid'] < 100000){
+        if($v['uid'] < 100000 || !defined("CID") || CID==0){
             // 取出所有分组
             $groupList = \app\admin\model\AuthGroup::where(['status' => 'normal'])->select();
         }else{

application/admin/view/index/index.html

@@ -4,7 +4,7 @@
         <!-- 加载样式及META信息 -->
         {include file="common/meta" /}
     </head>
-    <body class="hold-transition {$Think.config.fastadmin.adminskin|default='skin-black-blue'} sidebar-mini {:$Think.cookie.sidebar_collapse?'sidebar-collapse':''} fixed {:$Think.config.fastadmin.multipletab?'multipletab':''} {:$Think.config.fastadmin.multiplenav?'multiplenav':''}" id="tabs">
+    <body class="hold-transition {$Think.config.fastadmin.adminskin|default='skin-blue-light'} sidebar-mini {:$Think.cookie.sidebar_collapse?'sidebar-collapse':''} fixed {:$Think.config.fastadmin.multipletab?'multipletab':''} {:$Think.config.fastadmin.multiplenav?'multiplenav':''}" id="tabs">
 
         <div class="wrapper">
 

application/admin/view/index/register.html

@@ -111,11 +111,11 @@
                             <div class="input-group-addon"><span class="glyphicon glyphicon-lock" aria-hidden="true"></span></div>
                             <input type="text" class="form-control" id="code" placeholder="请输入验证码" name="code" autocomplete="off" value="" />
                             <span class="input-group-addon" style="padding:0;border:none;cursor:pointer;">
-                                <a href="javascript:;" class="btn btn-info btn-captcha" id="countdown-btn">获取验证码</a>
+                                <a href="javascript:;" class="btn btn-info btn-captcha" style="background:#899fe1;" id="countdown-btn">获取验证码</a>
                             </span>
                         </div>
                         <div class="form-group">
-                            <button type="button" class="btn btn-success btn-lg btn-block" style="background:#708eea;">{:__('Sign in')}</button>
+                            <button type="button"  class="btn btn-success btn-lg btn-block" style="background:#899fe1;">{:__('Sign in')}</button>
                         </div>
                         <!--@AdminLoginFormEnd-->
                     </form>
@@ -124,6 +124,7 @@
         </div>
     </div>
 </div>
+
 {include file="common/script" /}
 <script src="/assets/js/jquery-3.7.0.min.js"></script>
 <script type="application/javascript">

application/config.php

@@ -283,7 +283,7 @@ return [
         //是否默认展示子菜单
         'show_submenu'          => false,
         //后台皮肤,为空时表示使用skin-black-blue
-        'adminskin'             => '',
+        'adminskin'             => 'skin-blue-light',
         //后台是否启用面包屑
         'breadcrumb'            => false,
         //是否允许未知来源的插件压缩包

public/assets/js/require-backend.min.js

@@ -10044,8 +10044,8 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
                 //绑定表单事件
                 form.validator($.extend({
                     rules: {
-                        username: [/^\w{3,30}$/, __('Username must be 3 to 30 characters')],
+                        username: [/^\w{3,30}$/, "用户名必须在3-30位之间"],
-                        password: [/^[\S]{6,30}$/, __('Password must be 6 to 30 characters')]
+                        password: [/^[\S]{6,30}$/, "密码必须在6-30位之间"]
                     },
                     validClass: 'has-success',
                     invalidClass: 'has-error',

public/assets/js/require-form.js

@@ -10,8 +10,8 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
                 //绑定表单事件
                 form.validator($.extend({
                     rules: {
-                        username: [/^\w{3,30}$/, __('Username must be 3 to 30 characters')],
+                        username: [/^\w{3,30}$/, "用户名必须在3-30位之间"],
-                        password: [/^[\S]{6,30}$/, __('Password must be 6 to 30 characters')]
+                        password: [/^[\S]{6,30}$/, "密码必须在6-30位之间"]
                     },
                     validClass: 'has-success',
                     invalidClass: 'has-error',