切换门店增加员工关系

app/ghs/controllers/BaseController.php

@@ -2,6 +2,7 @@
 
 namespace ghs\controllers;
 
+use bizTy\shop\classes\ShopAdminClass;
 use bizTy\shop\classes\ShopClass;
 use bizTy\sj\classes\MerchantExtendClass;
 use bizTy\sj\services\MerchantExtendService;
@@ -20,7 +21,7 @@ use common\components\util;
 class BaseController extends PublicController
 {
 	public $admin, $adminId, $adminAvatar, $account;
-	public $sjId = 0, $sj = [], $sjExtend = [], $signPackage, $shopId = 0, $lookShopId = 0;
+	public $sjId = 0, $sj = [], $sjExtend = [], $signPackage, $shopId = 0, $lookShopId = 0, $shopAdminId = 0, $shopAdmin = [];
 	public $appId;
 	public $isWx = false;
 	public $isLogin = false;
@@ -66,6 +67,12 @@ class BaseController extends PublicController
 			if (empty($shop)) {
 				util::fail('没有找到您管理的门店');
 			}
+			$shopAdmin = ShopAdminClass::getByCondition(['shopId' => $currentShopId, 'adminId' => $adminId, 'delStatus' => 0]);
+			if (empty($shopAdmin)) {
+				util::fail('没有找到员工信息');
+			}
+			$this->shopAdmin = $shopAdmin;
+			$this->shopAdminId = $shopAdmin['id'] ?? 0;
 			$sjId = $shop['merchantId'];
 			$this->sjId = $sjId;
 			$sj = MerchantService::getMerchantById($sjId);

app/ghs/controllers/ShopController.php

@@ -150,13 +150,13 @@ class ShopController extends BaseController
 		}
 		util::success($res);
 	}
-
+	
 	//切换门店 linqh 2021.1.31
 	public function actionToggleShop()
 	{
 		$shopId = Yii::$app->request->post('shopId', 0);
-		$res = AdminClass::toggleShop($this->admin, $shopId, $this->sjId);
+		$res = AdminClass::toggleShop($this->admin, $shopId, $this->sjId, $this->shopAdmin);
 		util::success($res);
 	}
-
+	
 }

app/shop/controllers/BaseController.php

@@ -5,6 +5,7 @@ namespace shop\controllers;
 use biz\admin\classes\AdminClass;
 use biz\admin\services\ShopAdminService;
 use biz\custom\classes\CustomClass;
+use bizTy\shop\classes\ShopAdminClass;
 use bizTy\sj\classes\MerchantExtendClass;
 use biz\merchant\classes\ShopClass;
 use biz\merchant\services\AdminService;
@@ -21,7 +22,7 @@ class BaseController extends PublicController
 {
 	
 	public $admin, $adminId, $adminAvatar, $account, $customId = 0, $custom;
-	public $sjId = 0, $sj = [], $sjExtend = [], $signPackage, $shopId = 0;
+	public $sjId = 0, $sj = [], $sjExtend = [], $signPackage, $shopId = 0, $shopAdminId = 0, $shopAdmin = [];
 	public $appId;
 	public $isWx = false;
 	public $isLogin = false;
@@ -82,6 +83,12 @@ class BaseController extends PublicController
 			if (empty($shop)) {
 				util::fail('没有找到店铺');
 			}
+			$shopAdmin = ShopAdminClass::getByCondition(['shopId' => $currentShopId, 'adminId' => $adminId, 'delStatus' => 0]);
+			if (empty($shopAdmin)) {
+				util::fail('没有找到员工信息');
+			}
+			$this->shopAdmin = $shopAdmin;
+			$this->shopAdminId = $shopAdmin['id'] ?? 0;
 			$sjId = $shop['merchantId'];
 			$this->sjId = $sjId;
 			$sj = MerchantService::getMerchantById($sjId);
@@ -91,6 +98,6 @@ class BaseController extends PublicController
 		}
 		return parent::beforeAction($action);
 	}
-
+	
 }
 

biz-ghs/admin/classes/AdminClass.php

@@ -439,7 +439,7 @@ class AdminClass extends BaseClass
 	}
 	
 	//切换门店 linqh 2021.1.31
-	public static function toggleShop($admin, $toggleShopId, $sjId)
+	public static function toggleShop($admin, $toggleShopId, $sjId, $originShopAdmin)
 	{
 		if ($admin['super'] != 1) {
 			util::fail("您没有权限");
@@ -451,10 +451,7 @@ class AdminClass extends BaseClass
 		if (in_array($toggleShopId, $sjShopIds) == false) {
 			util::fail('不是您的门店');
 		}
-		$shopAdmin = ShopAdminClass::getByCondition(['shopId' => $toggleShopId, 'adminId' => $adminId, 'delStatus' => 0]);
-		if (empty($shopAdmin)) {
-			util::fail('您没有权限哦');
-		}
+		$shopAdmin = \bizTy\shop\classes\ShopAdminClass::toggleShopAddRelate($originShopAdmin, $toggleShopId);
 		self::updateById($adminId, ['currentShopId' => $toggleShopId]);
 		return $shopAdmin;
 	}

biz-ty/shop/classes/ShopAdminClass.php

@@ -14,6 +14,12 @@ class ShopAdminClass extends BaseClass
 	
 	const GENERATE_ADMIN_DATA = 'generate_admin_data_';//创建管理员需要的数据
 	
+	//添加客户 shish 2021.3.1
+	public static function addShopAdmin($data)
+	{
+		return self::add($data);
+	}
+	
 	//创建管理准备数据key shish 2020.4.17
 	public static function getGenerateAdminDataKey($shopId, $adminId)
 	{
@@ -94,4 +100,23 @@ class ShopAdminClass extends BaseClass
 		util::fail('此员工您没有权限操作');
 	}
 	
+	//切换门店时增加员工关系 shish 2021.3.1
+	public static function toggleShopAddRelate($originShopAdmin, $toggleShopId)
+	{
+		$adminId = $originShopAdmin['adminId'];
+		$roleId = $originShopAdmin['roleId'];
+		$sjId = $originShopAdmin['merchantId'];
+		$has = self::getCount(['shopId' => $toggleShopId, 'adminId' => $adminId, 'delStatus' => 0]);
+		if ($has) {
+			return $has;
+		}
+		$data = [
+			'roleId' => $roleId,
+			'adminId' => $adminId,
+			'shopId' => $toggleShopId,
+			'merchantId' => $sjId,
+		];
+		return self::addShopAdmin($data);
+	}
+
 }