权限

app-ghs/controllers/ItemController.php

@@ -39,7 +39,8 @@ class ItemController extends BaseController
         }
         $adminId = $this->adminId;
         $ptItemId = $item->itemId ?? 0;
-        $hasRightChange = ShopAdminClass::changeWeightRight($adminId, $ptItemId);
+        $respond = ShopAdminClass::changeWeightRight($adminId, $ptItemId);
+        $hasRightChange = $respond['hasRightChange'];
         if ($hasRightChange == 0) {
             util::fail('不能修改');
         }
@@ -79,7 +80,8 @@ class ItemController extends BaseController
         }
         $adminId = $this->adminId;
         $ptItemId = $item->itemId ?? 0;
-        $hasRightChange = ShopAdminClass::changeWeightRight($adminId, $ptItemId);
+        $respond = ShopAdminClass::changeWeightRight($adminId, $ptItemId);
+        $hasRightChange = $respond['hasRightChange'];
         if ($hasRightChange == 0) {
             util::fail('不能修改');
         }
@@ -122,7 +124,8 @@ class ItemController extends BaseController
         }
         $adminId = $this->adminId;
         $ptItemId = $item->itemId ?? 0;
-        $hasRightChange = ShopAdminClass::changeWeightRight($adminId, $ptItemId);
+        $respond = ShopAdminClass::changeWeightRight($adminId, $ptItemId);
+        $hasRightChange = $respond['hasRightChange'];
         if ($hasRightChange == 0) {
             util::fail('不能修改');
         }

app-ghs/controllers/ProductController.php

@@ -1259,8 +1259,8 @@ class ProductController extends BaseController
         //判断这个花材能否被修改单位比和重量，同步参考ShopController actionMyShop方法，关键词has_right_shop_list
         //判断当前登录的人，在自己有财务权限的main里面，是否包括了这个花材所属的平台id,在这个平台id下所有花材的main
         $adminId = $this->adminId;
-        $hasRightChange = ShopAdminClass::changeWeightRight($adminId, $ptItemId);
-        $respond['hasRightChange'] = $hasRightChange;
+        $hasRightRespond = ShopAdminClass::changeWeightRight($adminId, $ptItemId);
+        $respond['hasRightChange'] = $hasRightRespond['hasRightChange'];
 
         $respond['cpInfo'] = $cpInfo;
         util::success($respond);

biz-ghs/shop/classes/ShopAdminClass.php

@@ -18,7 +18,7 @@ class ShopAdminClass extends BaseClass
     public static $baseFile = '\bizGhs\shop\models\ShopAdmin';
 
 
-    public static function changeWeightRight($adminId,$ptItemId)
+    public static function changeWeightRight($adminId, $ptItemId)
     {
         //判断这个花材能否被修改单位比和重量，同步参考ShopController actionMyShop方法，关键词has_right_shop_list
         //判断当前登录的人，在自己有财务权限的main里面，是否包括了这个花材所属的平台id,在这个平台id下所有花材的main
@@ -26,7 +26,7 @@ class ShopAdminClass extends BaseClass
         $hasMainList = [];
         if (!empty($staffList)) {
             foreach ($staffList as $staff) {
-                if($staff->super == 1){
+                if ($staff->super == 1) {
                     $hasMainList[] = $staff->mainId;
                 }
             }
@@ -36,7 +36,7 @@ class ShopAdminClass extends BaseClass
         $hasNot = array_diff($sameMainList, $hasMainList);
         $hasRightChange = empty($hasNot) ? 1 : 0;
         //是否允许修改花材单位比、单位和重量等
-        return $hasRightChange;
+        return ['hasRightChange' => $hasRightChange];
     }
 
     const GENERATE_ADMIN_DATA = 'generate_ghs_admin_data_';//创建管理员需要的数据