| 123456789101112131415161718192021 |
- diff a/Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs b/Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs (rejected hunks)
- @@ -157,6 +157,19 @@
- if (DeviceType == "KssSignPos") dic["DeviceType"] = "快闪刷电签POS";
- if (DeviceType == "") dic["DeviceType"] = "";
-
- + //盟主信息
- + int LeaderUserId = int.Parse(function.CheckInt(dic["LeaderUserId"].ToString()));
- + if (LeaderUserId != 0)
- + {
- + Users users = db.Users.FirstOrDefault(m => m.Id == LeaderUserId) ?? new Users();
- + dic["UserInfo"] = users.MakerCode + "<br />" + users.RealName;
- + }
- +
- + //是否为第一台机具
- + int IsFirst = int.Parse(dic["IsFirst"].ToString());
- + if (IsFirst == 0) dic["IsFirst"] = "否";
- + if (IsFirst == 1) dic["IsFirst"] = "是";
- +
- }
- Dictionary<string, object> other = new Dictionary<string, object>();
- int TotalCount = 0;//总机具数
|
