hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #76: (feature/zy -> develop)

Browse Source 
Merge Request: feature: 面板

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/76?initial=true
This commit is contained in:
zhuyu 2025-05-28 11:09:00 +08:00 committed by Coding
commit b9849e981b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/controller/oa/Doc.php
View File

@ -89,7 +89,7 @@ class Doc extends Backend
->paginate($limit); ->paginate($limit);
foreach ($list as $k => $row) { foreach ($list as $k => $row) {
$list[$k]['url'] = cdnurl($row['path']); $list[$k]['fileurl'] = cdnurl($row['path']);
$list[$k]['filetype'] = pathinfo($list[$k]['url'], PATHINFO_EXTENSION); $list[$k]['filetype'] = pathinfo($list[$k]['url'], PATHINFO_EXTENSION);
} }
@ -108,7 +108,7 @@ class Doc extends Backend
$this->success("Ajax请求成功", null, ['id' => $ids]); $this->success("Ajax请求成功", null, ['id' => $ids]);
} }
$row['url'] = cdnurl($row['path']); $row['fileurl'] = cdnurl($row['path']);
$this->view->assign("row", $row->toArray()); $this->view->assign("row", $row->toArray());

2
application/admin/controller/oa/Task.php
View File

@ -106,7 +106,7 @@ class Task extends Backend
} }
$list[$k]['refuse_reason'] = $row['refuse_reason'] ?? ''; $list[$k]['refuse_reason'] = $row['refuse_reason'] ?? '';
$list[$k]['url'] = cdnurl($row['prove_file_path']); $list[$k]['fileurl'] = cdnurl($row['prove_file_path']);
$list[$k]['filetype'] = pathinfo($list[$k]['url'], PATHINFO_EXTENSION); $list[$k]['filetype'] = pathinfo($list[$k]['url'], PATHINFO_EXTENSION);
} }