11

Mall.Module.TradePavilion/CarrierModule.cs

@@ -1150,6 +1150,7 @@ namespace Mall.Module.TradePavilion
             return brandClassList;
         }
 
+
         /// <summary>
         /// 获取商载通链接
         /// </summary>

Mall.Repository/TradePavilion/RB_BrandRepository.cs

@@ -59,7 +59,7 @@ WHERE 1=1
                 }
                 if (query.BrandClassId > 0)
                 {
-                    builder.AppendFormat(" AND (a.{0}={2} OR FIND_IN_SET('{2}',a.{1}) > 0 ", nameof(RB_Brand_Extend.BrandClassId), nameof(RB_Brand_Extend.MoreBrandClassId), query.BrandClassId);
+                    builder.AppendFormat(" AND (a.{0}={2} OR FIND_IN_SET('{2}',a.{1})> 0) ", nameof(RB_Brand_Extend.BrandClassId), nameof(RB_Brand_Extend.MoreBrandClassId), query.BrandClassId);
                 }
                 if (query.ProjectType.HasValue && query.ProjectType > 0)
                 {

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -1874,6 +1874,57 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: dataList);
         }
 
+        /// <summary>
+        /// 获取品牌分类分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        public ApiResult GetBrandClassTreeEdit()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_BrandClass_Extend
+            {
+                MallBaseId = RequestParm.MallBaseId,
+                TenantId = RequestParm.TenantId,
+                BrandCategory = (BrandCategoryEnum)parms.GetInt("BrandCategory"),
+            };
+            var dataList = carrierModule.GetBrandClassListModule(query);
+            List<object> list = new List<object>();
+            var rootList = dataList.Where(qitem => qitem.ParentId == 0)?.OrderBy(qitem => qitem.SortNum)?.ToList();
+            foreach (var rItem in rootList)
+            {
+                List<object> subList = new List<object>();
+                var tempSubList = dataList.Where(qitem => qitem.ParentId == rItem.ID)?.OrderBy(qitem => qitem.SortNum)?.ToList();
+                foreach (var sItem in tempSubList)
+                {
+                    subList.Add(new
+                    {
+                        sItem.ID,
+                        sItem.ParentId,
+                        sItem.ClassName,
+                        sItem.Logo,
+                        sItem.BrandCategory,
+                        BrandCategoryName = sItem.BrandCategory.GetEnumName(),
+                        sItem.SortNum,
+                    });
+                }
+                var rootObj = new
+                {
+                    rItem.ID,
+                    rItem.ParentId,
+                    rItem.ClassName,
+                    rItem.Logo,
+                    rItem.BrandCategory,
+                    BrandCategoryName = rItem.BrandCategory.GetEnumName(),
+                    rItem.SortNum,
+                    subList
+                };
+                list.Add(rootObj);
+            }
+            return ApiResult.Success(data: list);
+        }
+
         /// <summary>
         /// 获取品牌分类实体
         /// </summary>