diff --git a/TradeManage/bin/TradeManageNew.dll b/TradeManage/bin/TradeManageNew.dll index 94725c1..a432501 100644 Binary files a/TradeManage/bin/TradeManageNew.dll and b/TradeManage/bin/TradeManageNew.dll differ diff --git a/TradeManageNew/DataNew.cs b/TradeManageNew/DataNew.cs index 74261d6..56e9bb8 100644 --- a/TradeManageNew/DataNew.cs +++ b/TradeManageNew/DataNew.cs @@ -31278,8 +31278,10 @@ delete from TemuShopGoodActiveDetail where Id=@Id"; public static List GetListTemuShopGoodActive(string where, int PageIndex, int PageSize, string Sort, out int RowCount) { QueryService2 ser = new QueryService2(); - ser.Tsql = @"select ID=cast(a.ID as int),a.Shopid,a.SKU,a.SPUID,a.BasePrice,a.CreateUserId,a.CreateTime,a.PostPrice,a.State,b.ShopName from TemuShopGoodActive a -left Join JC_Shop b on a.Shopid = b.Shopid"; + ser.Tsql = @"select ID=cast(a.ID as int),a.Shopid,a.SKU,a.SPUID,a.BasePrice,a.CreateUserId,a.CreateTime,a.PostPrice,a.State,b.ShopName,CreateUserName=c.Name from TemuShopGoodActive a +left Join JC_Shop b on a.Shopid = b.Shopid +left join jc_userinfo c on a.CreateUserId=c.UserId +"; ser.Tsql += " " + ser.Filter(where); ser.PageIndex = PageIndex; ser.PageSize = PageSize; diff --git a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx index 56c6f30..b93c557 100644 --- a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx +++ b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx @@ -189,7 +189,7 @@ col = new nblf.ui.DataGridColumn(); col.HeaderText = "创建人"; - col.CellTemplate = "{Bind CreateUserId}"; + col.CellTemplate = "{Bind CreateUserName}"; Array.add(datagrid1.Columns, col); col = new nblf.ui.DataGridColumn(); diff --git a/TradeManageNew/ModelNew.cs b/TradeManageNew/ModelNew.cs index 9c37259..1939310 100644 --- a/TradeManageNew/ModelNew.cs +++ b/TradeManageNew/ModelNew.cs @@ -11330,6 +11330,8 @@ namespace TradeManageNew /// CreateUserId /// public Int32? CreateUserId { get; set; } + + public String CreateUserName { get; set; } /// /// 创建日期 /// diff --git a/TradeManageNew/bin/TradeManageNew.dll b/TradeManageNew/bin/TradeManageNew.dll index d46ca04..a432501 100644 Binary files a/TradeManageNew/bin/TradeManageNew.dll and b/TradeManageNew/bin/TradeManageNew.dll differ diff --git a/TradeManageNew/bin/TradeManageNew.pdb b/TradeManageNew/bin/TradeManageNew.pdb index 7c78ff9..f6313f6 100644 Binary files a/TradeManageNew/bin/TradeManageNew.pdb and b/TradeManageNew/bin/TradeManageNew.pdb differ diff --git a/TradeManageNew/obj/Debug/TradeManageNew.dll b/TradeManageNew/obj/Debug/TradeManageNew.dll index d46ca04..a432501 100644 Binary files a/TradeManageNew/obj/Debug/TradeManageNew.dll and b/TradeManageNew/obj/Debug/TradeManageNew.dll differ diff --git a/TradeManageNew/obj/Debug/TradeManageNew.pdb b/TradeManageNew/obj/Debug/TradeManageNew.pdb index 7c78ff9..f6313f6 100644 Binary files a/TradeManageNew/obj/Debug/TradeManageNew.pdb and b/TradeManageNew/obj/Debug/TradeManageNew.pdb differ