运费价格权限调整

Signed-off-by: houhezheng <houhezheng@romens.cn>

backend/controllers/v1/transport/TransportSettingController.php

@@ -92,7 +92,7 @@ class TransportSettingController extends BaseController
      *                      GUID：指定省级guid,
      *                      CODE：门店编码,
      *                      NAME：门店名称,
-     *                IS_PERMIT:是否准许保存编辑（1：准许保存编辑，0：不准许保存编辑）"),
+     *                IS_PERMIT:是否准许编辑（0：禁止保存编辑，1：准许保存编辑，2：只准编辑保存省级）"),
      *   security={{"Authorization":{}}}
      * )
      */
@@ -120,17 +120,16 @@ class TransportSettingController extends BaseController
 
         //权限
         $permit = 1;
-        $branchInfo = ShopBranch::find()->select(['BRANCH_TYPE', 'SUPPROVINCE_GUID'])->where(['GUID' => $info['GROUP_GUID']]);
         $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
         //总部权限管理员1,分部管理员权限2。非权限内不可保存编辑
         if (!in_array($userInfo['ROLE_ID'], [USER_ROLE_REGION_ADMIN, USER_ROLE_HEADQUARTERS_ADMIN])) {
             $permit = 0;
         }
-        //分部管理员权限2,分部管理员所属上级与运送模板创建所属上级不一致时不准保存编辑
-        if ($userInfo['ROLE_ID'] == USER_ROLE_REGION_ADMIN && $userInfo['SUPPROVINCE_GUID'] != $branchInfo['SUPPROVINCE_GUID']) {
-            $permit = 0;
+        //分部管理员权限2,
+        if ($userInfo['ROLE_ID'] == USER_ROLE_REGION_ADMIN && $userInfo['PARENT_BRANCH_GUID'] == $info['GROUP_GUID']) {
+            $permit = 2;
         }
-        $info['IS_PERMIT'] = $permit;  //是否准许编辑保存，1：准许保存编辑，0：禁止保存编辑
+        $info['IS_PERMIT'] = $permit;  //是否准许编辑保存，0：禁止保存编辑，1：准许保存编辑，2：只准编辑保存省级
         return $info;
     }
 
@@ -203,10 +202,10 @@ class TransportSettingController extends BaseController
 
         //删除条件：总部权限删除所有，省级只能删除自己。
         switch ($userInfo['ROLE_ID']) {
-            case '1':
+            case USER_ROLE_HEADQUARTERS_ADMIN:
                 $where = ['ACTIVITY_GUID' => $params['GUID']];
                 break;
-            case '2':
+            case USER_ROLE_REGION_ADMIN:
                 $where = ['ACTIVITY_GUID' => $params['GUID'], 'BRANCH_GUID' => $userInfo['BRANCH_GUID']];
                 break;
             default:

backend/models/v1/transport/TransportSetting.php

@@ -87,20 +87,25 @@ class TransportSetting extends \app\models\v1\BaseModel
     public function templates($platform_type)
     {
         $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
-        //省级权限，只展示省级所属的信息
-        $activityGUID = [];
-        if ($userInfo['ROLE_ID'] == USER_ROLE_REGION_ADMIN) {
-            $array = ShopPackagingcostsBranches::transportSetting($userInfo['BRANCH_GUID']);
-            foreach ($array as $key => $value) {
-                $activityGUID[] = $value['ACTIVITY_GUID'];
-            }
+        //权限
+        $where = [];
+        switch ($userInfo['ROLE_ID']) {
+            case USER_ROLE_HEADQUARTERS_ADMIN:
+                $where = [];
+                break;
+            case USER_ROLE_REGION_ADMIN:
+                $where = ['or', ['ts.GROUP_GUID' => $userInfo['PARENT_BRANCH_GUID']], ['ts.GROUP_GUID' => $userInfo['BRANCH_GUID']]];
+                break;
+            default:
+                $where = ['>',1,2];
+                break;
         }
 
         $query = static::find()->alias('ts')
             ->select(['ts.GUID', 'stt.NAME as TRANSPORT_NAME', 'ts.BASE_FEE', 'ts.BASE_WEIGHT', 'ts.BASE_WEIGHT_FEE', 'ts.IS_USED', 'ts.SELECT_AREA'])
             ->leftJoin('shop_transport_type stt', 'ts.TRANSPOR_TTYPE=stt.GUID')
             ->where(['ts.PLATFORM_TYPE' => $platform_type])
-            ->andFilterWhere(['ts.GUID' => $activityGUID]);
+            ->andFilterWhere($where);
 
         $dataProvider = new ActiveDataProvider([
             'query' => $query->asArray(),