Compare commits

..

No commits in common. "e64952022d487bf901f2af1a64fb311884fb5e1c" and "b73af56831ae595687073da84c5e73e91b8650c2" have entirely different histories.

2 changed files with 3 additions and 3 deletions

View File

@ -89,7 +89,7 @@ class File extends Controller
public function distinct()
{
$map = ['uuid' => AdminService::getUserId()];
$db1 = SystemFile::mk()->fieldRaw('max(id) id')->where($map)->group('type,xkey');
$db1 = SystemFile::mk()->fieldRaw('max(id) id')->where($map)->group('type,hash');
$db2 = $this->app->db->table($db1->buildSql())->alias('dt')->field('id');
SystemFile::mk()->whereRaw("id not in {$db2->buildSql()}")->delete();
$this->success('清理重复文件成功!');

View File

@ -126,9 +126,9 @@
<label class="layui-hide" id="ImageDialogUploadLayout">
<!-- 图片上传组件 开始 -->
{if isset($get.file) && $get.file eq 'image'}
<button class="layui-btn" data-file data-path="{$get.path|default=''}" data-type="png,jpg,jpeg,gif"></button>
<button class="layui-btn" data-file data-type="png,jpg,jpeg,gif"></button>
{else}
<button class="layui-btn" data-file="mul" data-path="{$get.path|default=''}" data-type="png,jpg,jpeg,gif"></button>
<button class="layui-btn" data-file="mul" data-type="png,jpg,jpeg,gif"></button>
{/if}
<!-- 图片上传组件 结束 -->
</label>