1

application/admin/controller/Clean.php

@@ -1,6 +1,8 @@
 <?php
 namespace app\admin\controller;
 
+use think\Db;
+
 /**
  * 管理系统系统设置类
  */
@@ -50,6 +52,8 @@ class Clean extends Base
                     $servicelog[] = $servicelog_id[$i]['servicelog_id'];
                 }
                 if($delete_time != ''){
+                    // 启动事务
+                    Db::startTrans();
                     try {
                         //聊天数据清理
                         db('service_log')->where('start_time','<',$del_time)->delete();
@@ -60,29 +64,45 @@ class Clean extends Base
                         db('kfstatetimes')->where('sday','<',$delete_time)->delete();
                         db('service_data')->where('add_date','<',$delete_time)->delete();
                         db('servicetimelog')->where('cdate','<',$delete_time)->delete();
+                        // 提交事务
+                        Db::commit();
                         return json(['code' => 1, 'data' => '', 'msg' => '数据清理成功']);
                     } catch (\Exception $e) {
+                        // 回滚事务
+                        Db::rollback();
                         return json(['code' => -1, 'data' => '', 'msg' => $e->getMessage()]);
                     }
                 }else{
+                    // 启动事务
+                    Db::startTrans();
                     try {
                         db('service_log')->where('start_time','<',$del_time)->delete();
                         db('chat_log')->where('servicelog_id','in',$servicelog)->delete();
                         db('alarm')->where('servicelog_id','in',$servicelog)->delete();
+                        // 提交事务
+                        Db::commit();
                         return json(['code' => 1, 'data' => '', 'msg' => '聊天数据清理成功']);
                     } catch (\Exception $e) {
+                        // 回滚事务
+                        Db::rollback();
                         return json(['code' => -2, 'data' => '', 'msg' => $e->getMessage()]);
                     }
                 }
             }else{
                 if($delete_time != ''){
+                    // 启动事务
+                    Db::startTrans();
                     try {
                         db('kfonlinehistory')->where('wday','<',$delete_time)->delete();
                         db('kfstatetimes')->where('sday','<',$delete_time)->delete();
                         db('service_data')->where('add_date','<',$delete_time)->delete();
                         db('servicetimelog')->where('cdate','<',$delete_time)->delete();
+                        // 提交事务
+                        Db::commit();
                         return json(['code' => 1, 'data' => '', 'msg' => '客服操作记录清理成功']);
                     } catch (\Exception $e) {
+                        // 回滚事务
+                        Db::rollback();
                         return json(['code' => -3, 'data' => '', 'msg' => $e->getMessage()]);
                     }
                 }else{

application/admin/controller/Sensitivec.php

@@ -174,7 +174,8 @@ class Sensitivec extends Base
         //获取表单上传文件
         $file = request()->file('excel');
         if(empty($file)){
-            return json(['code' => -4, 'data' => '', 'msg' => '请先上传文件']);
+            $this->error('请先上传文件');
+            //return json(['code' => -4, 'data' => '', 'msg' => '请先上传文件']);
         }
 
         $info = $file->validate(['ext' => 'xlsx'])->move(ROOT_PATH . 'public' . DS . 'uploads');