xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/follow' into develop

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-08-22 14:59:23 +08:00
parent e0100891ea 96475892e9
commit 4ed04647de
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/crm/service/FollowService.php
+2 -4
View File
@@ -60,10 +60,8 @@ class FollowService
}
$follow['picture_full'] = $oss_picture;
// $follow = Util::formatDate($follow,['created_at','updated_at','follow_time']);
$follow['follow_time'] = empty($follow['follow_time'])?'':date('Y-m-d H:i:s', $follow['follow_time']);
$follow['created_at'] = empty($follow['created_at'])?'':date('Y-m-d H:i:s', $follow['created_at']);
$follow['updated_at'] = empty($follow['updated_at'])?'':date('Y-m-d H:i:s', $follow['updated_at']);;
$follow = Util::formatDate($follow,['created_at','updated_at','follow_time']);
$follow['follow_time'] = empty($follow['follow_time'])?'':$follow['follow_time'];
// $follow = Util::formatDate($follow);
return $follow;
}
app/crmAdmin/service/CustomerService.php
+1 -3
View File
@@ -480,9 +480,7 @@ class CustomerService
$ossservice = new OssService();
foreach ($follow as $item) {
$item = Util::formatDate($item,['created_at','updated_at','follow_time']);
$item['follow_time'] = empty($item['follow_time'])?'':date('Y-m-d H:i:s', $item['follow_time']);
$item['created_at'] = empty($item['created_at'])?'':date('Y-m-d H:i:s', $item['created_at']);
$item['updated_at'] = empty($item['updated_at'])?'':date('Y-m-d H:i:s', $item['updated_at']);;
$item['follow_time'] = empty($item['follow_time'])?'':$item['follow_time'];
$item['picture_full'] = empty($item->picture)?'':$ossservice->generatePrivateUrl($item->picture);
}