1

Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs

@@ -718,9 +718,9 @@ namespace Mall.Module.TradePavilion
         /// <param name="rowsCount"></param>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_CompanyEnterprise_Extend> GetCompanyEnterprisePageListModule(int pageIndex, int pageSize, out long rowsCount, RB_CompanyEnterprise_Extend query)
+        public List<RB_CompanyEnterprise_Extend> GetCompanyEnterprisePageModule(int pageIndex, int pageSize, out long rowsCount, RB_CompanyEnterprise_Extend query)
         {
-            var list = companyEnterpriseRepository.GetCompanyPageListRepository(pageIndex, pageSize, out rowsCount, query);
+            var list = companyEnterpriseRepository.GetCompanyEnterprisePageRepository(pageIndex, pageSize, out rowsCount, query);
             if (list != null && list.Any())
             {
                 //查询用户列表
@@ -729,11 +729,10 @@ namespace Mall.Module.TradePavilion
                 foreach (var item in list)
                 {
                     var umodel = ulist.Where(x => x.Id == item.CreateBy).FirstOrDefault();
-                    item.UserName = umodel.Name;
-                    item.UserIcon = umodel.Photo;
+                    item.UserName = umodel?.Name ?? "";
+                    item.UserIcon = umodel?.Photo ?? "";
                 }
             }
-
             return list;
         }
 

Mall.Repository/TradePavilion/RB_CompanyEnterpriseRepository.cs

@@ -22,7 +22,7 @@ namespace Mall.Repository.TradePavilion
         /// <param name="rowsCount"></param>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_CompanyEnterprise_Extend> GetCompanyPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_CompanyEnterprise_Extend query)
+        public List<RB_CompanyEnterprise_Extend> GetCompanyEnterprisePageRepository(int pageIndex, int pageSize, out long rowsCount, RB_CompanyEnterprise_Extend query)
         {
             rowsCount = 0;
             DynamicParameters parameters = new DynamicParameters();

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -3361,7 +3361,7 @@ namespace Mall.WebApi.Controllers
                     //宜宾商再通特色颜色处理
                     if ((miniProgram.TenantId ?? 0) == 30)
                     {
-                        resultMallShopStyle = new ResultMallShopStyle() { main = "#017edf", secondary = "#ea850", IsEducation = 0 };
+                        resultMallShopStyle = new ResultMallShopStyle() { main = "#017edf", secondary = "#ea8505", IsEducation = 0 };
                     }
                     break;
                 case MallShopStyleEnum.PureBlack:

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -3417,7 +3417,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             };
             query.MallBaseId = userInfo.MallBaseId;
             query.TenantId = userInfo.TenantId;
-            var list = buildingCarrierModule.GetCompanyEnterprisePageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            var list = buildingCarrierModule.GetCompanyEnterprisePageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
             pageModel.count = Convert.ToInt32(rowsCount);
             pageModel.pageData = list;
             return ApiResult.Success(data: pageModel);

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -4490,7 +4490,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
-            var list = buildingCarrierModule.GetCompanyEnterprisePageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            var list = buildingCarrierModule.GetCompanyEnterprisePageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
             pageModel.count = Convert.ToInt32(rowsCount);
             pageModel.pageData = list;
             return ApiResult.Success(data: pageModel);

Mall.WebApi/Controllers/User/TenantController.cs

@@ -2205,11 +2205,12 @@ 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));
+            //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();
         }
     }
 }
\ No newline at end of file