From 9f2b6dada7304026de555b3e751b17a5a65e6d7a Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Wed, 26 Nov 2025 14:36:05 +0800
Subject: [PATCH] 1、修复会长小程序端编辑获取信息报错和选择了活动时间但还是提示请选择活动时间 2、修复小程序添加分会成员选择会员时无法下拉问题
---
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