fix:無admin權限使用者登入失敗&index數量顯示問題

fix:User/ListUsers，Admin數量和實際管理員數量不同

Merchant Token Vault Management/backstage/Controllers/HomeController.cs

@@ -63,20 +63,20 @@ namespace backstage.Controllers
             var parameters = new Dictionary<string, string>
             {
                 { "token", token }
-
             };
 
+            var departmentCount = 0;
             var apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
             if (apiResult.IsSuccess)
             {
                 DepartmentsResponse = JsonConvert.DeserializeObject<DepartmentsResponse>(apiResult.Data.ToString());
                 if (DepartmentsResponse.r == 0)
                 {
-                    ViewBag.departmentCount = DepartmentsResponse.count;
+					departmentCount = DepartmentsResponse.count;
                 }
 
             }
-
+            ViewBag.departmentCount = departmentCount;
 
 			#endregion
 
@@ -89,16 +89,18 @@ namespace backstage.Controllers
 
             };
 
+            var vaultCount = 0;
 			apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
             if (apiResult.IsSuccess)
             {
                 var response = JsonConvert.DeserializeObject<Response>(apiResult.Data.ToString());
                 if (response.r == 0)
                 {
-                    ViewBag.valutCount = response.count;
+					vaultCount = response.count;
                 }
 
             }
+            ViewBag.vaultCount = vaultCount;
 
 			#endregion
 
@@ -106,6 +108,8 @@ namespace backstage.Controllers
 			var departmentList = DepartmentsResponse.merchants;
             int totalEntry = 0;
             url = _config["IP"] + "/v2/vault/get";
+            if (departmentList != null)
+            {
                 foreach (var d in departmentList)
                 {
                         parameters = new Dictionary<string, string>
@@ -131,6 +135,8 @@ namespace backstage.Controllers
 
                     }
                 }
+            }
+            
             ViewBag.totalEntry = totalEntry;
 
 

Merchant Token Vault Management/backstage/Controllers/UserController.cs

@@ -335,12 +335,18 @@ namespace backstage.Controllers
             }
             #endregion
 
+            var adminCount = 0;
             if (adminResponse.r == 0)
             {
                 if (adminResponse.userCount > 0)
                 {
                     foreach (var a in adminResponse.Users)
                     {
+                        if (a.enabled == 1)
+                        {
+                            adminCount++;
+                        }
+           
 						foreach (var v in UserResponse.Users)
                         {
                             if (v.uid == 1)
@@ -352,7 +358,7 @@ namespace backstage.Controllers
                     }
                 }
             }
-            ViewBag.adminCount = adminResponse.userCount;
+            ViewBag.adminCount = adminCount;
             ViewBag.userCount = UserResponse.userCount;
             return View(UserResponse);
 
@@ -1088,17 +1094,18 @@ namespace backstage.Controllers
             var parameters = new Dictionary<string, string>
             {
                 { "token", token }
-
             };
 
             var apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
             if (apiResult.IsSuccess)
             {
                 DepartmentsResponse = JsonConvert.DeserializeObject<DepartmentsResponse>(apiResult.Data.ToString());
-                if (DepartmentsResponse.r == 0)
+                /*if (DepartmentsResponse.r == 0)
                 {
                     return View(DepartmentsResponse);
-                }
+                }*/
+
+                return View(DepartmentsResponse);
 
             }
 

Merchant Token Vault Management/backstage/Views/Home/Index.cshtml

@@ -35,7 +35,7 @@
 				<h4 class="card-title">@Localizer["Number of Token Vaults"]</h4>
 				<div class="card-content text-center">
 					<img src="~/images/admin-vault.svg" class="img-fuild">
-					<p class="number text-center">@ViewBag.valutCount</p>
+					<p class="number text-center">@ViewBag.vaultCount</p>
 				</div>
 			</div>
 		</div>