github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 05:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

【程序目录】优化组合数据获取

Browse Source
This commit is contained in:
wuhaotian 2025-06-19 15:58:33 +08:00
parent 4e26c419fc
commit 0977dfe8b0
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crmeb/app/dao/system/config/SystemGroupDataDao.php
View File

@ -41,7 +41,9 @@ class SystemGroupDataDao extends BaseDao
*/
public function getGroupDataList(array $where, int $page, int $limit)
{
return $this->search($where)->page($page, $limit)->order('sort desc,id DESC')->select()->toArray();
return $this->search($where)->when($page && $limit, function ($query) use ($page, $limit) {
$query->page($page, $limit);
})->order('sort desc,id DESC')->select()->toArray();
}
/**

4
crmeb/app/services/diy/DiyServices.php
View File

@ -334,9 +334,9 @@ class DiyServices extends BaseServices
$systemGroupServices = app()->make(SystemGroupServices::class);
$menus_gid = $systemGroupServices->value(['config_name' => 'routine_my_menus'], 'id');
$banner_gid = $systemGroupServices->value(['config_name' => 'routine_my_banner'], 'id');
$routine_my_menus = $systemGroupDataServices->getGroupDataList(['gid' => $menus_gid]);
$routine_my_menus = $systemGroupDataServices->getGroupDataList(['gid' => $menus_gid], 'all');
$routine_my_menus = $routine_my_menus['list'] ?? [];
$routine_my_banner = $systemGroupDataServices->getGroupDataList(['gid' => $banner_gid]);
$routine_my_banner = $systemGroupDataServices->getGroupDataList(['gid' => $banner_gid], 'all');
$routine_my_banner = $routine_my_banner['list'] ?? [];
$my_banner_status = boolval($info['my_banner_status']);
return compact('status', 'order_status', 'routine_my_menus', 'routine_my_banner', 'color_change', 'my_banner_status');

3
crmeb/app/services/system/config/SystemGroupDataServices.php
View File

@ -74,9 +74,10 @@ class SystemGroupDataServices extends BaseServices
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function getGroupDataList(array $where)
public function getGroupDataList(array $where, $type = 'limit')
{
[$page, $limit] = $this->getPageValue();
if ($type == 'all') $page = $limit = 0;
$list = $this->dao->getGroupDataList($where, $page, $limit);
$count = $this->dao->count($where);
$type = '';