页面修改

Edu.Module.Customer/CustomerModule.cs

@@ -228,6 +228,10 @@ namespace Edu.Module.Customer
                 {
                     extModel.ApproveName = UserReidsCache.GetUserLoginInfo(extModel.ApproveId)?.AccountName ?? "";
                 }
+                if (extModel.CustomerType != CatetoryTypeEnum.Other&&extModel.CategoryId>0)
+                {
+                    extModel.CategoryName = customer_CategoryRepository.GetEntity(extModel.CategoryId)?.CategoryName ?? "";
+                }
             }
             return extModel;
         }

Edu.Module.User/StudentModule.cs

@@ -281,11 +281,11 @@ namespace Edu.Module.User
                         {
                             if (tempCustomer.CustomerType == Common.Enum.Customer.CatetoryTypeEnum.Other)
                             {
-                                item.EnterpriseName = tempCustomer?.CategoryName ?? "";
+                                item.EnterpriseName = tempCustomer?.EnterpriseName ?? "";
                             }
                             else
                             {
-                                item.EnterpriseName = tempCustomer?.EnterpriseName ?? "";
+                                item.EnterpriseName = tempCustomer?.CategoryName ?? "";
                             }
                         }
                         else

Edu.WebApi/Controllers/Customer/B2BCustomerController.cs

@@ -57,14 +57,35 @@ namespace Edu.WebApi.Controllers.Customer
                 QApproveState=base.ParmJObj.GetInt("QApproveState")
             };
             var list = customerModule.GetCustomerPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+
+            List<object> result = new List<object>();
             foreach (var item in list)
             {
                 if (item.CreateBy > 0)
                 {
                     item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
                 }
+                result.Add(new
+                {
+                    item.CustomerId,
+                    item.CustomerName,
+                    item.ContactNumber,
+                    item.EnterpriseName,
+                    item.CustomerType,
+                    CustomerTypeName = item.CustomerType.ToName(),
+                    item.StuNum,
+                    item.OrderNum,
+                    item.OrderSales,
+                    item.ApproveState,
+                    item.ApproveStateStr,
+                    item.CreateBy,
+                    item.CreateByName,
+                    item.CreateTimeStr,
+                    item.CategoryName,
+                    item.CategoryId,
+                });
             }
-            pageModel.PageData = list;
+            pageModel.PageData = result;
             pageModel.Count = rowsCount;
             return ApiResult.Success(data: pageModel);
         }