1

application/admin/controller/Admins.php

@@ -90,7 +90,7 @@ class Admins extends Base
 
             return json(['code' => 1, 'data' => '', 'msg' => '添加管理员成功']);
         }
-        $admingroup = db('admingroup')->select();
+        $admingroup = db('admingroup')->where('status',1)->select();
         $this->assign([
             'admingroup' => $admingroup,
             'status' => config('kf_status')
@@ -134,7 +134,7 @@ class Admins extends Base
 
         $id = input('param.id/d');
         $info = db('admins')->where('id', $id)->find();
-        $admingroup = db('admingroup')->select();
+        $admingroup = db('admingroup')->where('status',1)->select();
 
         $this->assign([
             'info' => $info,
@@ -286,14 +286,17 @@ class Admins extends Base
                     ] ;
                 }
             }
-            if(!empty($data)){
-                try {
-                    db('admingroup')->where('group_id',$param['group_id'])->update($info);
+            $admingrouppower = db('admingrouppower')->where('group_id',$param['group_id'])->select();
+            try {
+                db('admingroup')->where('group_id',$param['group_id'])->update($info);
+                if(!empty($admingrouppower)){
                     db('admingrouppower')->where('group_id',$param['group_id'])->delete();
+                }
+                if(!empty($data)){
                     db('admingrouppower')->insertAll($data);
-                } catch (\Exception $e) {
-                    return json(['code' => -2, 'data' => '', 'msg' => $e->getMessage()]);
                 }
+            } catch (\Exception $e) {
+                return json(['code' => -2, 'data' => '', 'msg' => $e->getMessage()]);
             }
             return json(['code' => 1, 'data' => '', 'msg' => '编辑权限组成功']);
         }

application/admin/controller/Login.php

@@ -49,6 +49,11 @@ class Login extends Controller
                 return json(['code' => -5, 'data' => '', 'msg' => '您已被禁用']);
             }
 
+            $group = db('admingroup')->where('group_id', $userInfo['group_id'])->find();
+            if(1 != $group['status']){
+                return json(['code' => -6, 'data' => '', 'msg' => '您的权限角色已被禁用']);
+            }
+
             session('user_name',$userName);
             session('user_id',$userInfo['id']);
 

application/admin/controller/System.php

@@ -537,14 +537,14 @@ class System extends Base
             for($c=0;$c<count($chat_log);$c++){
                 $content = json_decode($chat_log[$c]['content'], true);
                 $chat_log[$c]['time_line'] = date('Y-m-d H:i:s',$chat_log[$c]['time_line']);
-                $result[$key]['detail'] = $result[$key]['detail'].$chat_log[$c]['time_line'];
+                $result[$key]['detail'] = $result[$key]['detail'].' '.$chat_log[$c]['time_line'].' '.$chat_log[$c]['from_name'];
                 if(!empty($content['text'])){
                     $content['content'] = $content['text'];
                 }
                 if(!empty($content['img'])){
                     $content['content'] = '<img width="100%" src="'.$content['img'].'"/>';
                 }
-                $result[$key]['detail'] = $result[$key]['detail'].$content['content'];
+                $result[$key]['detail'] = $result[$key]['detail'].' '.$content['content'];
             }
 
         }

application/admin/controller/Users.php

@@ -16,8 +16,10 @@ class Users extends Base
             $limit  = $param['pageSize'];
             $offset = (($param['pageNumber'] - 1) * $limit);
             $where = [];
-            if (empty($param['searchText']) === false) {
+            if (empty($param['searchText']) === false || intval($param['searchText']) == 0) {
                 $where['user_account|user_name|user_job_number|fullname'] = ['like', '%' . $param['searchText'] . '%'];
+            }else{
+                return 1;
             }
             //客服组
             if ($param['group_id'] != '' && $param['group_id'] != 0) {
@@ -53,7 +55,7 @@ class Users extends Base
                 $result[$key]['operate'] = $this->makeBtn($vo['id']);
             }
 
-            $return['total'] = db('users')->count();  //总数据
+            $return['total'] = db('users')->where($where)->count();  //总数据
             $return['rows'] = $result;
 
             return json($return);