Merge branch 'development' of http://gitlab-ebiz.yiyao365.cn/newshop/newshopback into development

backend/config/urlmanager.php

@@ -318,6 +318,7 @@ return [
                         'GET,OPTIONS search-user' => 'search-user',
                         'GET,OPTIONS manage-group-list' => 'manage-group-list',
                         'POST,OPTIONS manage-add' => 'manage-add',
+                        'GET,OPTIONS get-user-info' => 'get-user-info',
                     ],
                 ],
             ],

backend/controllers/v1/authority/ManageListController.php

@@ -169,4 +169,36 @@ class ManageListController extends BaseController
         }
        
     }
+
+      /**
+     * @OA\GET(
+     *   path="/backend/web/v1/authority/manage-lists/get-user-info",
+     *   tags={"权限管理"},
+     *   summary="查看用户拥有权限(张晓林)",
+     *   description="管理员列表",
+     *   @OA\Parameter(name="GUID", description="管理员列表GUID",in="query",@OA\Schema(type="string")),
+     *   @OA\Response(response="200",description="
+     *          GUID:管理员GUID,
+     *          USER_ID:shop_rbac_role_user表中USER_ID,
+     *          NAME:管理员名称，
+     *          BRANCH_NAME:门店名称
+     *          ROLE_ID:角色GUID
+     *    "),
+     *   security={{"Authorization": {}}}
+     * )
+     */
+
+     public function actionGetUserInfo(){
+        $param = Yii::$app->request->get();
+        $rbacUserModel = new ShopRbacUser();
+        $userInfo = $rbacUserModel::find()->select(['sru.GUID','srru.USER_ID','sru.NAME','srru.ROLE_ID','sb.NAME as BRANCH_NAME'])
+        ->leftJoin('shop_rbac_role_user srru','srru.USER_ID=sru.USER_GUID')
+        ->leftJoin('shop_branch as sb','sb.GUID=sru.BRANCH_GUID')
+        ->where(['sru.GUID'=>$param['GUID']])
+        ->from('shop_rbac_user as sru')
+        ->asArray()
+        ->one();
+        return $userInfo;
+     }
+
 }
\ No newline at end of file

backend/models/v1/rbacuser/ShopRbacUser.php

@@ -52,7 +52,7 @@ class ShopRbacUser extends  BaseModel implements IdentityInterface
     public function rules()
     {
         return [
-            [['GUID', 'CODE'], 'required','message'=>'不能为空'],
+            [['GUID'], 'required','message'=>'不能为空'],
             [['CREATE_DATE', 'UPDATE_DATE'], 'safe'],
             [['IS_FORBID', 'CONTACTSEX', 'IS_UPLOAD_HX', 'IS_BELONG', 'AGE'], 'integer'],
             [['GUID', 'CODE', 'PASSWORD', 'ORG_GUID', 'BRANCH_GUID', 'CREATE_GUID', 'UPDATE_GUID', 'MOBILEPHONE', 'USER_GUID', 'REMARK', 'ALIPAY_UID', 'WX_UNIONID', 'WX_OPENID', 'SHARE_NO'], 'string', 'max' => 50],