修改时间为空判断

Areas/Api/Controllers/SysAdminController.cs

@@ -219,7 +219,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 curData.Add("AdminName", subdata["AdminName"].ToString()); //用户名
                 curData.Add("RealName", subdata["RealName"].ToString()); //名称
                 curData.Add("RoleId", int.Parse(subdata["Role"].ToString())); //角色
-                curData.Add("LastLoginDate", subdata["LastLoginDate"] == null ? "" : DateTime.Parse(subdata["LastLoginDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //最后登录时间
+                curData.Add("LastLoginDate", subdata["LastLoginDate"].ToString() == "" ? "" : DateTime.Parse(subdata["LastLoginDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //最后登录时间
                 dataList.Add(curData);
             }
             Other.Add("Count", count); //总数

Areas/Api/Controllers/v1/Main1/ConsumerOrdersController.cs

@@ -111,7 +111,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 curData.Add("Status", status); //交易状态(0 未支付 1 已支付)
                 curData.Add("PayMode", subdata["PayMode"].ToString()); //交易平台(1 支付宝 2 微信)
                 curData.Add("OrderNo", subdata["OrderNo"].ToString()); //交易号
-                curData.Add("CreateDate", subdata["CreateDate"].ToString() == null ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
+                curData.Add("CreateDate", subdata["CreateDate"].ToString() == "" ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
                 curData.Add("MaxDivi", ConsumerProfitService.Sum(" and OrderId=" + subdata["Id"].ToString() + "","GetMoney").ToString("f2")); //分账金额
                 if (query.SubjectType == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
                 if (query.SubjectType == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户

Areas/Api/Controllers/v1/Main1/MerchantAddInfoController.cs

@@ -97,7 +97,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 curData.Add("CertMerchantName", subdata["CertMerchantName"].ToString()); //商户名称
                 curData.Add("ServicePhone", subdata["ServicePhone"].ToString()); //客服电话
                 curData.Add("BizStoreAddress", subdata["BizStoreAddress"].ToString()); //门店地址
-                curData.Add("CreateDate", subdata["CreateDate"].ToString() == null ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //进件时间
+                curData.Add("CreateDate", subdata["CreateDate"].ToString() == "" ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //进件时间
                 var userInfo = UsersService.Query(MerchantInfoService.Query(MerchantId).UserId);
                 curData.Add("MakerCode", userInfo.MakerCode); //所属创客编号
                 curData.Add("RealName", userInfo.RealName); //所属创客姓名

Areas/Api/Controllers/v1/Main1/MerchantDepositOrderController.cs

@@ -82,7 +82,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 curData.Add("MerchantName", query.CertMerchantName); //交易商户
                 curData.Add("AliPID", query.AlipayPid); //支付宝PID
                 curData.Add("WeChatNo", query.SubMchid); //微信商户号
-                curData.Add("UpdateDate", subdata["UpdateDate"].ToString() == null ? "" : DateTime.Parse(subdata["UpdateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
+                curData.Add("UpdateDate", subdata["UpdateDate"].ToString() == "" ? "" : DateTime.Parse(subdata["UpdateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
                 curData.Add("PayMode", int.Parse(subdata["Sort"].ToString())); //支付方式(1 支付宝 2 微信)
                 curData.Add("ActPayPrice", decimal.Parse(subdata["ActPayPrice"].ToString())); //支付金额
 

Areas/Api/Controllers/v1/Main1/MerchantInfoController.cs

@@ -72,7 +72,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 curData.Add("MerchantName", merAddInfo.CertMerchantName); //商户名称
                 curData.Add("AliPID", merAddInfo.AlipayPid); //支付宝PID
                 curData.Add("WeChatNo", merAddInfo.SubMchid); //微信商户号
-                curData.Add("UpdateDate", order.UpdateDate.ToString() == null ? "" : DateTime.Parse(order.UpdateDate.ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
+                curData.Add("UpdateDate", order.UpdateDate.ToString() == "" ? "" : DateTime.Parse(order.UpdateDate.ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
                 curData.Add("PayMode", order.Sort); //支付方式(1 支付宝 2 微信)
                 curData.Add("Status", Status); //达标状态(-1 未参与 0 考核中 1 已通过 2 未通过 101 待领取 100 已领取 99 发放中)
                 curData.Add("Months", subdata["Months"].ToString()); //达标月数

Areas/Api/Controllers/v1/Main2/ConsumerOrdersController.cs

@@ -112,7 +112,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 curData.Add("Status", status); //交易状态(0 未支付 1 已支付)
                 curData.Add("PayMode", subdata["PayMode"].ToString()); //交易平台(1 支付宝 2 微信)
                 curData.Add("OrderNo", subdata["OrderNo"].ToString()); //交易号
-                curData.Add("CreateDate", subdata["CreateDate"].ToString() == null ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
+                curData.Add("CreateDate", subdata["CreateDate"].ToString() == "" ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //交易时间
                 curData.Add("MaxDivi", ConsumerProfitService.Sum(" and OrderId=" + subdata["Id"].ToString() + "","GetMoney").ToString("f2")); //分账金额
                 if (query.SubjectType == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
                 if (query.SubjectType == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户

Areas/Api/Controllers/v1/Main2/MerchantAddInfoController.cs

@@ -117,7 +117,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 curData.Add("CertMerchantName", subdata["CertMerchantName"].ToString()); //商户名称
                 curData.Add("ServicePhone", subdata["ServicePhone"].ToString()); //客服电话
                 curData.Add("BizStoreAddress", subdata["BizStoreAddress"].ToString()); //门店地址
-                curData.Add("CreateDate", subdata["CreateDate"].ToString() == null ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //进件时间
+                curData.Add("CreateDate", subdata["CreateDate"].ToString() == "" ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //进件时间
                 var userInfo = UsersService.Query(MerchantInfoService.Query(MerchantId).UserId);
                 curData.Add("MakerCode", userInfo.MakerCode); //所属创客编号
                 curData.Add("RealName", userInfo.RealName); //所属创客姓名

Areas/Api/Controllers/v1/Main2/MerchantDepositOrderController.cs

@@ -75,7 +75,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 curData.Add("Id", subdata["Id"].ToString()); //Id
                 curData.Add("MerchantName", query.CertMerchantName); //商户名称
                 curData.Add("MctNo", subdata["MchtNo"].ToString()); //商户号
-                curData.Add("UpdateDate", subdata["UpdateDate"].ToString() == null ? "" : DateTime.Parse(subdata["UpdateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
+                curData.Add("UpdateDate", subdata["UpdateDate"].ToString() == "" ? "" : DateTime.Parse(subdata["UpdateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
                 curData.Add("PayMode", int.Parse(subdata["Sort"].ToString())); //支付方式(1 支付宝 2 微信)
                 curData.Add("ActPayPrice", decimal.Parse(subdata["ActPayPrice"].ToString())); //支付金额
 

Areas/Api/Controllers/v1/Main2/MerchantInfoController.cs

@@ -65,7 +65,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 curData.Add("Id", MerchantId); //Id
                 curData.Add("MerchantName", merAddInfo.CertMerchantName); //商户名称
                 curData.Add("MctNo", merAddInfo.MchtNo); //商户号
-                curData.Add("UpdateDate", order.UpdateDate.ToString() == null ? "" : DateTime.Parse(order.UpdateDate.ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
+                curData.Add("UpdateDate", order.UpdateDate.ToString() == "" ? "" : DateTime.Parse(order.UpdateDate.ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
                 curData.Add("PayMode", order.Sort); //支付方式(1 支付宝 2 微信)
                 curData.Add("Status", Status); //达标状态(-1 未参与 0 考核中 1 已通过 2 未通过 101 待领取 100 已领取 99 发放中)
                 curData.Add("Months", subdata["Months"].ToString()); //达标月数