Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Common/Plugin/NPOIHelper.cs

@@ -262,7 +262,6 @@ namespace Mall.Common.Plugin
                 {
                     headerRow = sheet.GetRow(HeaderRowIndex);
                     cellCount = headerRow.LastCellNum;
-
                     for (int i = headerRow.FirstCellNum; i <= cellCount; i++)
                     {
                         if (headerRow.GetCell(i) == null)

Mall.Repository/User/RB_MenuRepository.cs

@@ -4,6 +4,7 @@ using System.Text;
 using Mall.Model.Entity.User;
 using Mall.Model.Extend.User;
 using System.Linq;
+using VT.FW.DB.Dapper;
 
 namespace Mall.Repository.User
 {
@@ -55,6 +56,7 @@ namespace Mall.Repository.User
         /// <returns></returns>
         public List<RB_Menu_Extend> GetPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_Menu_Extend query)
         {
+            DynamicParameters parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.Append(" SELECT * FROM RB_Menu WHERE 1=1 ");
             if (query != null)
@@ -65,10 +67,16 @@ namespace Mall.Repository.User
                 }
                 if (query.MenuName != null && !string.IsNullOrEmpty(query.MenuName.Trim()))
                 {
-                    builder.AppendFormat(" AND MenuName LIKE '%{0}%' ", query.MenuName.Trim());
+                    builder.AppendFormat(" AND MenuName LIKE @MenuName ");
+                    parameters.Add("@MenuName", "%" + query.MenuName.Trim() + "%");
+                }
+                if (!string.IsNullOrEmpty(query.MenuUrl))
+                {
+                    builder.AppendFormat(" AND MenuUrl LIKE @MenuUrl ");
+                    parameters.Add("@MenuUrl", "%" + query.MenuUrl.Trim() + "%");
                 }
             }
-            return GetPage<RB_Menu_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+            return GetPage<RB_Menu_Extend>(pageIndex, pageSize, out rowCount, builder.ToString(),parameters).ToList();
         }
     }
 }

Mall.Repository/User/RB_Miniprogram_PageManageRepository.cs

@@ -4,6 +4,8 @@ using System.Text;
 using Mall.Model.Entity.User;
 using Mall.Model.Extend.User;
 using System.Linq;
+using VT.FW.DB.Dapper;
+
 namespace Mall.Repository.User
 {
     /// <summary>
@@ -50,6 +52,7 @@ namespace Mall.Repository.User
         /// <returns></returns>
         public List<RB_Miniprogram_PageManage_Extend> GetPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_Miniprogram_PageManage_Extend query)
         {
+            DynamicParameters parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.Append(" SELECT * FROM RB_Miniprogram_PageManage WHERE 1=1 ");
             if (query != null)
@@ -60,7 +63,13 @@ namespace Mall.Repository.User
                 }
                 if (query.PageName != null && !string.IsNullOrEmpty(query.PageName.Trim()))
                 {
-                    builder.AppendFormat(" AND {0} LIKE '%{1}%' ", nameof(RB_Miniprogram_PageManage_Extend.PageName), query.PageName);
+                    builder.AppendFormat(" AND {0} LIKE @PageName ", nameof(RB_Miniprogram_PageManage_Extend.PageName));
+                    parameters.Add("@PageName", "%" + query.PageName + "%");
+                }
+                if (query.PageUrl != null && !string.IsNullOrEmpty(query.PageUrl.Trim()))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @PageUrl ", nameof(RB_Miniprogram_PageManage_Extend.PageUrl));
+                    parameters.Add("@PageUrl", "%" + query.PageUrl + "%");
                 }
                 if (query.Status >= 0)
                 {
@@ -68,7 +77,7 @@ namespace Mall.Repository.User
                 }
             }
             builder.Append(" ORDER BY PageSort ");
-            return GetPage<RB_Miniprogram_PageManage_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+            return GetPage<RB_Miniprogram_PageManage_Extend>(pageIndex, pageSize, out rowCount, builder.ToString(), parameters).ToList();
         }
 
         /// <summary>

Mall.WebApi/Controllers/User/TenantController.cs

@@ -24,6 +24,9 @@ using Dnc.Api.Throttle;
 using Mall.WebApi.Helper;
 using Mall.DataHelper.Import;
 using System.IO;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using DotNetCore.CAP.Dashboard;
+using Consul;
 
 namespace Mall.WebApi.Controllers.User
 {
@@ -1308,8 +1311,17 @@ namespace Mall.WebApi.Controllers.User
         /// <returns></returns>
         public ApiResult GetMenuPage()
         {
-            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
-            var query = JsonConvert.DeserializeObject<RB_Menu_Extend>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            ResultPageModel pageModel = new ResultPageModel()
+            {
+                pageIndex=parms.GetInt("pageIndex"),
+                pageSize=parms.GetInt("pageSize")
+            };
+            var query = new RB_Menu_Extend()
+            {
+                MenuName = parms.GetStringValue("MenuName"),
+                MenuUrl = parms.GetStringValue("MenuUrl"),
+            };
             var list = menuModule.GetMenuPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
             pageModel.count = Convert.ToInt32(rowsCount);
             pageModel.pageData = list;
@@ -1494,8 +1506,19 @@ namespace Mall.WebApi.Controllers.User
         /// <returns></returns>
         public ApiResult GetMiniProgramePageManage_Page()
         {
-            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
-            var query = JsonConvert.DeserializeObject<RB_Miniprogram_PageManage_Extend>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            ResultPageModel pageModel = new ResultPageModel()
+            {
+                pageIndex=parms.GetInt("pageIndex"),
+                pageSize=parms.GetInt("pageSize"),
+            };
+            var query = new RB_Miniprogram_PageManage_Extend()
+            {
+                QPageType = parms.GetInt("QPageType"),
+                PageName = parms.GetStringValue("PageName"),
+                PageUrl = parms.GetStringValue("PageUrl"),
+                Status = parms.GetInt("Status"),
+            };
             var list = programPageModule.GetMiniprogram_PageManage_PageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
             pageModel.count = Convert.ToInt32(rowsCount);
             pageModel.pageData = list;
@@ -2205,12 +2228,11 @@ namespace Mall.WebApi.Controllers.User
         /// <returns></returns>
         public ApiResult TestYBBrandImport()
         {
-            //string rootPath = Path.Combine(Directory.GetCurrentDirectory(), "upfile");
-            //string filePath = rootPath+ @"\宜宾模板文件.xlsx";
-            //string tempPath = rootPath + @"\TempImg";
-            //var list = BrandHelper.ImportYBBrandData(filePath, tempPath);
-            //return ApiResult.Success(data: Common.Plugin.JsonHelper.Serialize(list));
-            return ApiResult.Success();
+            string rootPath = Path.Combine(Directory.GetCurrentDirectory(), "upfile");
+            string filePath = rootPath + @"\消费品牌.xlsx";
+            string tempPath = rootPath + @"\TempImg";
+            var list = BrandHelper.ImportYBBrandData(filePath, tempPath);
+            return ApiResult.Success(data: Common.Plugin.JsonHelper.Serialize(list));
         }
     }
 }
\ No newline at end of file