lip 3 месяцев назад
Родитель
Сommit
0716f22589
2 измененных файлов с 5 добавлено и 2 удалено
  1. 4 1
      app/admin/controller/Admin.php
  2. 1 1
      app/admin/controller/Config.php

+ 4 - 1
app/admin/controller/Admin.php

@@ -99,6 +99,7 @@ class Admin extends BaseController
                 return $this->error('用户名已存在');
             }
             if (!empty($id)) {
+                unset($params['username']);
                 AdminModel::where('id', $id)->update($params);
             } else {
                 $admin = AdminModel::create($params);
@@ -206,7 +207,7 @@ class Admin extends BaseController
             }
 
             //如果登录信息中含有client——id则自动进行绑定
-            $userInfo = User::where('cs_uid', $admin->id)->find();
+            $userInfo = User::where('account', $admin->username)->where('role', '>', 0)->find();
             if(!$userInfo){
                 throw new \Exception('用户不存在');
             }
@@ -232,6 +233,8 @@ class Admin extends BaseController
                 'adminInfo' => $admin,
             ];
 
+            //通知客服签到
+            wsSendMsg($userInfo['id'],'sign',['id'=>$userInfo['id']]);
         } catch (\Exception $e) {
             return $this->error($e->getMessage());
         }

+ 1 - 1
app/admin/controller/Config.php

@@ -19,7 +19,7 @@ class Config extends BaseController
     {
         $flag = $this->request->param('flag', 1);
         $list = ConfigModel::where('flag', $flag)->select();
-        $select = ConfigModel::getSelect($this->lang, false);
+        $select = ConfigModel::getSelect($this->lang, true);
         foreach ($list as &$item) {
             if (isset($select[$item['field']])) {
                 $item['select'] = $select[$item['field']];