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

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

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

@@ -61,76 +61,82 @@ namespace backstage.Controllers
             string token = User.FindFirstValue("token");
 
             var parameters = new Dictionary<string, string>
-              {
-                    { "token", token }
-
-                };
+            {
+                { "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
 
-            #endregion
-
-            #region Token Vault 數量
-          url = _config["IP"] + "/tsp/merchant/vault/list";
+			#region Token Vault 數量
+		    url = _config["IP"] + "/tsp/merchant/vault/list";
 
-             parameters = new Dictionary<string, string>
-              {
+            parameters = new Dictionary<string, string>
+            {
                   
 
-                };
+            };
 
-             apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
+            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
+			#endregion
 
-            #region Token Vault Entry  資料數量
-            var departmentList = DepartmentsResponse.merchants;
+			#region Token Vault Entry  資料數量
+			var departmentList = DepartmentsResponse.merchants;
             int totalEntry = 0;
             url = _config["IP"] + "/v2/vault/get";
-            foreach (var d in departmentList)
+            if (departmentList != null)
             {
-                 parameters = new Dictionary<string, string>
-                  {
-                        { "Merchant_id", d.merchant_id.ToString() }
+                foreach (var d in departmentList)
+                {
+                        parameters = new Dictionary<string, string>
+                        {
+                            { "Merchant_id", d.merchant_id.ToString() }
 
-                    };
+                        };
 
-                 apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
-                if (apiResult.IsSuccess)
-                {
-                    var TokenVaultResponse = JsonConvert.DeserializeObject<TokenVaultResponse>(apiResult.Data.ToString());
-                    if (TokenVaultResponse.r == 0)
+                        apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
+                    if (apiResult.IsSuccess)
                     {
-                        if (TokenVaultResponse.info!=null)
+                        var TokenVaultResponse = JsonConvert.DeserializeObject<TokenVaultResponse>(apiResult.Data.ToString());
+                        if (TokenVaultResponse.r == 0)
                         {
-                            foreach (var v in TokenVaultResponse.info)
+                            if (TokenVaultResponse.info!=null)
                             {
-                                totalEntry += v.tokenCount;
+                                foreach (var v in TokenVaultResponse.info)
+                                {
+                                    totalEntry += v.tokenCount;
+                                }
                             }
                         }
-                    }
 
+                    }
                 }
             }
+            
             ViewBag.totalEntry = totalEntry;
 
 

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

@@ -335,13 +335,19 @@ namespace backstage.Controllers
             }
             #endregion
 
+            var adminCount = 0;
             if (adminResponse.r == 0)
             {
                 if (adminResponse.userCount > 0)
                 {
                     foreach (var a in adminResponse.Users)
                     {
-                        foreach (var v in UserResponse.Users)
+                        if (a.enabled == 1)
+                        {
+                            adminCount++;
+                        }
+           
+						foreach (var v in UserResponse.Users)
                         {
                             if (v.uid == 1)
                                 v.isAdmin = true;
@@ -352,7 +358,7 @@ namespace backstage.Controllers
                     }
                 }
             }
-            ViewBag.adminCount = adminResponse.userCount;
+            ViewBag.adminCount = adminCount;
             ViewBag.userCount = UserResponse.userCount;
             return View(UserResponse);
 
@@ -1086,19 +1092,20 @@ namespace backstage.Controllers
 
 
             var parameters = new Dictionary<string, string>
-              {
-                    { "token", token }
-
-                };
+            {
+                { "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);
 
             }
 
@@ -1402,10 +1409,10 @@ namespace backstage.Controllers
                 {
                     url = _config["IP"] + "/admin/add";
                     parameters = new Dictionary<string, string>
-                  {
+                    {
                         { "token", token},
-                      { "user",JsonConvert.SerializeObject( userData)}
-                 };
+                        { "user",JsonConvert.SerializeObject( userData)}
+                    };
 
                     apiResult = await _callApi.CallAPI(url, parameters, httpMethod);
                     if (apiResult.IsSuccess)

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>