From 6f95057f3dc1c9a518d87aae218617b9b442c998 Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Sat, 27 May 2023 10:16:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC=E5=AF=BC?=
=?UTF-8?q?=E5=87=BA=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/customer/controller/Index.php | 3 +--
public/static/assets/gougu/module/tablePlus.js | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/customer/controller/Index.php b/app/customer/controller/Index.php
index 37a9c49..2ef8ab9 100644
--- a/app/customer/controller/Index.php
+++ b/app/customer/controller/Index.php
@@ -104,7 +104,7 @@ class Index extends BaseController
}
}
- $ct_sql= Db::name('CustomerTrace')->order('id desc')->buildSql();
+ $ct_sql= Db::name('CustomerTrace')->order('id desc')->limit(1)->buildSql();
$orderby = 'a.create_time desc';
if(isset($param['orderby'])){
$orderby = 'ct.'.$param['orderby'];
@@ -122,7 +122,6 @@ class Index extends BaseController
->join('department d', 'a.belong_did = d.id')
->join($ct_sql.' ct', 'ct.cid = a.id','left')
->order($orderby)
- ->group('a.id') //去重
->paginate($rows, false, ['query' => $param])
->each(function ($item, $key) {
$item->belong_name = Db::name('Admin')->where(['id' => $item->belong_uid])->value('name');
diff --git a/public/static/assets/gougu/module/tablePlus.js b/public/static/assets/gougu/module/tablePlus.js
index 321a23f..94976e6 100644
--- a/public/static/assets/gougu/module/tablePlus.js
+++ b/public/static/assets/gougu/module/tablePlus.js
@@ -56,6 +56,9 @@ layui.define(['jquery','layer','table'], function(exports) {
let excel_limit = params.excel_limit||1000;
if(is_excel){
let toolbar = ['filter', {title:'导出EXCEL',layEvent: 'LAYTABLE_EXCEL',icon: 'layui-icon-export'}];
+ if(!params.toolbar){
+ params.toolbar = true;
+ }
if(!params.defaultToolbar){
params.defaultToolbar = toolbar;
}