Merge branch 'sdzq' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.Repository/TradePavilion/RB_Commerce_ActivityTypeRepository.cs

@@ -90,7 +90,7 @@ WHERE 1=1
                     builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Commerce_ActivityType_Extend.TypeName));
                     parameters.Add("Name", "%" + query.TypeName.Trim() + "%");
                 }
-                if (string.IsNullOrWhiteSpace(query.Ids))
+                if (!string.IsNullOrWhiteSpace(query.Ids))
                 {
                     builder.AppendFormat($@" AND { nameof(RB_Commerce_ActivityType_Extend.Id)} in ({query.Ids}) ");
                 }

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -436,13 +436,14 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         public ApiResult SetCommerceActivityType()
         {
-            JObject jObj = JObject.Parse(RequestParm.msg.ToString());
-            var extModel = new RB_Commerce_ActivityType_Extend()
-            {
-                Id = jObj.GetInt("Id"),
-                TypeName = jObj.GetStringValue("TypeName"),
-                CoverImage=jObj.GetStringValue("CoverImage")
-            };
+            RB_Commerce_ActivityType_Extend extModel = JsonConvert.DeserializeObject<RB_Commerce_ActivityType_Extend>(RequestParm.msg.ToString());
+            //JObject jObj = JObject.Parse(RequestParm.msg.ToString());
+            //var extModel = new RB_Commerce_ActivityType_Extend()
+            //{
+            //    Id = jObj.GetInt("Id"),
+            //    TypeName = jObj.GetStringValue("TypeName"),
+            //    CoverImage=jObj.GetStringValue("CoverImage")
+            //};
             extModel.Status = Common.Enum.DateStateEnum.Normal;
             extModel.MallBaseId = RequestParm.MallBaseId;
             extModel.TenantId = RequestParm.TenantId;