From 6e0fcbd49c9e7b441bb77e48dfea7e7ead25d06c Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 4 Mar 2024 13:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8E=E6=97=A0=E4=BB=BB=E4=BD=95=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/service/StoreServiceRepository.php         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/common/repositories/store/service/StoreServiceRepository.php b/app/common/repositories/store/service/StoreServiceRepository.php
index 5aa806c..f806060 100644
--- a/app/common/repositories/store/service/StoreServiceRepository.php
+++ b/app/common/repositories/store/service/StoreServiceRepository.php
@@ -189,14 +189,18 @@ class StoreServiceRepository extends BaseRepository
     // 获取当前用户的员工信息
     public function getServices($uid, array $where = [],$is_sys = 1){
         // $where['uid'] = $uid;
-
+        // 商户类别：0=普通商户，1=酒道馆，2=供应商
         $list = $this->dao->getSearch([])
-            ->when(isset($where['appoint_mer_id']) && $where['appoint_mer_id'] !== '',function($query) use ($where){
-                // 存在指定商户ID
+            ->when(isset($where['appoint_mer_id']) && $where['appoint_mer_id'] !== '',function($query) use ($where, $is_sys, $uid){
+                // 存在指定商户ID 并且为酒道馆
                 $query->hasWhere('merchant',function($query){
                     $query->where('is_del', 0);
                 })->where('StoreService.mer_id', $where['appoint_mer_id'])
-                    ->where('StoreService.is_manage', 1);
+                    ->when($is_sys == 1,function($query){
+                        $query->where('StoreService.is_manage', 1);
+                    },function($query) use ($uid){
+                        $query->where('StoreService.uid',$uid);
+                    });
             },function($query) use ($is_sys, $uid){
                 // 不存在指定商户id
                 $query->hasWhere('merchant',function($query) use ($is_sys){