From 1db9a4130699636cabe7e0c9f7f15d004aadada0 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 21 Nov 2025 09:13:08 +0800
Subject: [PATCH] 1、超级分红 2、vip专区

---
 admin/app/common/model/file/UploadGroup.php |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/admin/app/common/model/file/UploadGroup.php b/admin/app/common/model/file/UploadGroup.php
index d69f8b4..6359944 100644
--- a/admin/app/common/model/file/UploadGroup.php
+++ b/admin/app/common/model/file/UploadGroup.php
@@ -16,18 +16,21 @@
     /**
      * 分组详情
      */
-    public static function detail($group_id, $shop_supplier_id = 0) {
-        return (new static())->where('shop_supplier_id', '=', $shop_supplier_id)->find($group_id);
+    public static function detail($group_id, $shop_supplier_id = 0, $branch_id = 0) {
+        return (new static())->where('shop_supplier_id', '=', $shop_supplier_id)
+        ->where('branch_id', '=', $branch_id) // by lyzflash
+        ->find($group_id);
     }
 
     /**
      * 获取列表记录
      */
-    public function getList($groupType = '', $shop_supplier_id = 0)
+    public function getList($groupType = '', $shop_supplier_id = 0, $branch_id = 0)
     {
         $model = $this;
         !empty($groupType) && $model = $model->where('group_type', '=', trim($groupType));
         return $model->where('shop_supplier_id', '=', $shop_supplier_id)
+            ->where('branch_id', '=', $branch_id)
             ->where('is_delete', '=', 0)
             ->order(['sort' => 'asc', 'create_time' => 'desc'])
             ->select();

--
Gitblit v1.9.2