From cb8a32101b2eb54b51c62d511008b3de60d2ef75 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Sun, 28 Apr 2024 09:53:11 +0800
Subject: [PATCH] admin agreement

---
 app/Admin/Controllers/AgreementController.php    | 3 ++-
 app/Admin/Services/EmployeeSignRepairService.php | 2 +-
 app/Admin/Services/EmployeeSignService.php       | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Admin/Controllers/AgreementController.php b/app/Admin/Controllers/AgreementController.php
index 74ba590..7f32708 100644
--- a/app/Admin/Controllers/AgreementController.php
+++ b/app/Admin/Controllers/AgreementController.php
@@ -136,8 +136,9 @@ class AgreementController extends AdminController
         $filename = time().'.zip';
         $filepath = storage_path('app/' . $filename);
         $zip->open($filepath, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
+        $baseUrl = Storage::disk('public')->url('');
         foreach($model->images as $item) {
-            $path = data_get($item, 'value');
+            $path = str_replace($baseUrl, '', $item);
             $info = pathinfo($path);
             $zip->addFile(Storage::disk('public')->path($path), data_get($info, 'basename'));
         }
diff --git a/app/Admin/Services/EmployeeSignRepairService.php b/app/Admin/Services/EmployeeSignRepairService.php
index 77917fd..78b1c42 100644
--- a/app/Admin/Services/EmployeeSignRepairService.php
+++ b/app/Admin/Services/EmployeeSignRepairService.php
@@ -97,7 +97,7 @@ class EmployeeSignRepairService extends BaseService
             'employee_id' => $data['employee_id'],
             'sign_time' => $data['sign_time']
             ])->exists()) {
-            return '已经打过卡了';
+            return '已经补过卡了';
         }
         // todo 已经打卡不能申请
         // todo 验证申请时间是否重复
diff --git a/app/Admin/Services/EmployeeSignService.php b/app/Admin/Services/EmployeeSignService.php
index b2e9922..0f6b622 100644
--- a/app/Admin/Services/EmployeeSignService.php
+++ b/app/Admin/Services/EmployeeSignService.php
@@ -15,6 +15,11 @@ class EmployeeSignService extends BaseService
 
     protected string $modelFilterName = EmployeeSignFilter::class;
 
+    public function sortColumn()
+    {
+        return 'date';
+    }
+
     public function preDelete(array $ids): void
     {
         // 删除打卡日志