Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -68,10 +68,13 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SettleAmount", "3"); //结算金额
             Fields.Add("CashFreezeAmt", "3"); //冻结金额
             Fields.Add("UserLevel", "0"); //创客等级
-            if (ShowFlag == 0)
+            if (SelfId == 0 && ParentId == 0)
             {
-                Dictionary<string, object> objs = new Dictionary<string, object>();
-                return Json(objs);
+                if (ShowFlag == 0)
+                {
+                    Dictionary<string, object> objs = new Dictionary<string, object>();
+                    return Json(objs);
+                }
             }
 
             string condition = " and Status>-1";