From a510e9d0d0d22f65f58757f9be20da83febc7398 Mon Sep 17 00:00:00 2001
From: witersen <1801168257@qq.com>
Date: Sun, 19 Dec 2021 00:39:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=B9=E5=AE=9A=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8B=20=E4=B8=BA=E7=94=A8=E6=88=B7=E7=BB=84?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=20=E7=94=A8=E6=88=B7=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E7=9C=8B=E5=88=B0=E8=A2=AB=E6=8E=88=E6=9D=83=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 02.php/app/controller/svnserve.class.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/02.php/app/controller/svnserve.class.php b/02.php/app/controller/svnserve.class.php
index a35dfc0..67c13b1 100644
--- a/02.php/app/controller/svnserve.class.php
+++ b/02.php/app/controller/svnserve.class.php
@@ -894,7 +894,9 @@ class Svnserve extends Controller
 
             //查看用户本身的仓库 
             $userRepList = FunGetUserPriRepListWithoutPri($authzContent, $this->this_username, '/');
-            $allRepList = array_merge($userRepList, $allRepList);
+            if ($userRepList != null) {
+                $allRepList = array_merge($userRepList, $allRepList);
+            }
 
             //查看用户所在所有分组的仓库
             $groupUserList = FunGetSvnGroupUserList($authzContent);
@@ -903,14 +905,14 @@ class Svnserve extends Controller
                     //获取当前用户组有权限的仓库列表
                     $groupRepList =  FunGetGroupPriRepListWithoutPri($authzContent, $key);
                     if ($groupRepList != null) {
-                        $allRepList = array_merge($allRepList, $groupRepList);
+                        $allRepList = array_merge($groupRepList, $allRepList);
                     }
                 }
             }
 
             //处理
             if ($allRepList == null) {
-                $repArray = null;
+                $repArray = array();
                 $total = 0;
             } else {
                 foreach ($repArray as $key => $value) {