Merge branch 'master' of http://git.bocai108.com:10180/Ethan/Customer-Service

# Conflicts:
#	vendor/GatewayWorker_windows/Applications/whisper/Events.php

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/Report.php

@@ -263,6 +263,7 @@ class Report extends Base
             $all_last[$key]['s1'] = secendToHourMinit($all_last[$key]['s1']);
             $all_last[$key]['s2'] = secendToHourMinit($all_last[$key]['s2']);
             $all_last[$key]['s3'] = secendToHourMinit($all_last[$key]['s3']);
+            $all_last[$key]['all'] = secendToHourMinit($all_last[$key]['all']);
             $all_last[$key]['s1p'] = perDisplay($all_last[$key]['s1p']);
             $all_last[$key]['s2p'] = perDisplay($all_last[$key]['s2p']);
             $all_last[$key]['s3p'] = perDisplay($all_last[$key]['s3p']);

application/admin/controller/Sensitivec.php

@@ -53,15 +53,20 @@ class Sensitivec extends Base
     public function addsensitive(){
     	if(request()->isPost()){
 
-            $param = input('post.');
-
-            $has = db('sensitivewords')->field('sensitivewords_id')->where('sensitivewords_word', $param['sensitivewords_word'])->find();
-            if(!empty($has)){
+            $param     = input('post.');
+            $findWhere = [
+                'sensitivewords_word' => $param['sensitivewords_word'],
+                'sensitivewords_for'  => $param['sensitivewords_for'],
+            ];
+
+            $has = db('sensitivewords')->field('sensitivewords_id')->where($findWhere)->find();
+            if (empty($has) === false) {
                 return json(['code' => -1, 'data' => '', 'msg' => '该敏感词已经存在']);
             }
 
-			$param['sensitivewords_time'] = date('Y-m-d H:i:s');
-			$param['sensitivewords_uid']  = session('user_id');
+            $param['sensitivewords_time'] = date('Y-m-d H:i:s');
+            $param['sensitivewords_uid']  = session('user_id');
+
             try {
                 db('sensitivewords')->insert($param);
             } catch(\Exception $e) {

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);

application/admin/view/sensitivec/addsensitive.html

@@ -22,6 +22,7 @@
                 <div class="ibox-content">
                     <form class="form-horizontal m-t layui-form" id="commentForm" method="post" action="{:url('Sensitivec/addsensitive')}">
 
+                        <input style="display: none" id="type" name="sensitivewords_for" value=""/>
                         <div class="form-group">
                             <label class="col-sm-3 control-label">内容：</label>
                             <div class="input-group col-sm-4">
@@ -71,6 +72,9 @@
 <script src="__JS__/jquery.form.js"></script>
 <script type="text/javascript">
     const myHost = "http://" + window.location.host;
+    const type = getQueryVariable('type');
+    $('#type').val(type);
+
     layui.use(['form', 'upload'], function(){
         var form = layui.form;
 
@@ -82,7 +86,16 @@
         //     $("#robotgroups_id").val(value.value);
         // });
     });
-
+    function getQueryVariable(variable)
+    {
+      var query = window.location.search.substring(1);
+      var vars = query.split("&");
+      for (var i=0;i<vars.length;i++) {
+        var pair = vars[i].split("=");
+        if(pair[0] == variable){return pair[1];}
+      }
+      return(false);
+    }
     layui.use(['form', 'upload'], function(){
         var form = layui.form;
     });

application/admin/view/sensitivec/index.html

@@ -27,7 +27,7 @@
             </div>
         </div>
         <div class="ibox-content">
-            <a href="/admin/sensitivec/addsensitive.html">
+            <a id="add" href="/admin/sensitivec/addsensitive.html?type=2">
                 <button class="btn btn-primary" type="button" style="margin-top:5px"><strong>新 增</strong>
                 </button>
             </a>
@@ -92,9 +92,11 @@
         if (id == 1) {
             $("#current1").css("background","#eee");
             $("#current2").css("background","#fff");
+            $("#add").attr('href','/admin/sensitivec/addsensitive.html?type=1');
         } else if (id == 2) {
             $("#current2").css({"background":"#eee"});
             $("#current1").css({"background":"#fff"});
+            $("#add").attr('href','/admin/sensitivec/addsensitive.html?type=2');
         }
         initTable()
     }

application/service/controller/Words.php

@@ -184,11 +184,11 @@ class Words extends Common
                 'status'      => input('post.status'),
                 'update_time' => date('Y-m-d H:i:s'),
             ];
-            $deleteResult  = model('Words')->addWords($userWordsData);
+            $addResult     = model('Words')->addWords($userWordsData);
 
             // 参数返回.
-            if (empty($deleteResult) === false) {
-                return json(['code' => 1, 'data' => [], 'msg' => '成功']);
+            if (empty($addResult) === false) {
+                return json(['code' => 1, 'data' => ['id' => $addResult], 'msg' => '成功']);
             } else {
                 return json(['code' => 1, 'data' => [], 'msg' => 1]);
             }

application/service/model/Words.php

@@ -73,7 +73,7 @@ class Words extends Model
      */
     public function addWords($data)
     {
-        $result = $this->insert($data);
+        $result = $this->insertGetId($data);
 
         return $result;