修改显示问题

Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -129,9 +129,17 @@ namespace MySystem.Areas.Admin.Controllers
             foreach (Dictionary<string, object> dic in diclist)
             {
                 //是否真实调升/降
-                int ActivityList = int.Parse(dic["ActivityList"].ToString());
-                if (ActivityList == 1) dic["ActivityList"] = "已真实调升";
-                if (ActivityList == 2) dic["ActivityList"] = "已真实调降";
+                if (!string.IsNullOrEmpty(dic["ActivityList"].ToString()))
+                {
+                    // int ActivityList = Convert.ToInt32(dic["ActivityList"].ToString());
+                    string ActivityList = dic["ActivityList"].ToString();
+                    if (ActivityList == "1") dic["ActivityList"] = "已真实调升";
+                    if (ActivityList == "2") dic["ActivityList"] = "已真实调降";
+                }
+                if (string.IsNullOrEmpty(dic["ActivityList"].ToString()))
+                {
+                    dic["ActivityList"] = "";
+                }
                 //绑定状态
                 int BindingState = int.Parse(dic["BindingState"].ToString());
                 if (BindingState == 0) dic["BindingState"] = "未绑定";
@@ -154,8 +162,8 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Remove("StoreId");
                 //产品类型
                 dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["BrandId"].ToString()));
-                //参加活动
-                dic["ActivityList"] = RelationClass.GetProfitObjectsActivesList(dic["ActivityList"].ToString());
+                // // 参加活动
+                // dic["ActivityList"] = RelationClass.GetProfitObjectsActivesList(dic["ActivityList"].ToString());
                 //绑定商户
                 int BindMerchantId = int.Parse(function.CheckInt(dic["BindMerchantId"].ToString()));
                 PosMerchantInfo bindmerchantid_MerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.Id == BindMerchantId) ?? new PosMerchantInfo();