Commit 35ca3678 authored by 黄奎's avatar 黄奎

页面修改

parent 4e35cb1f
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LumenWorksX.Framework.IO" Version="1.0.1" /> <PackageReference Include="LumenWorks.Framework.IO.Core" Version="1.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" /> <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.0.1" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.0.1" />
......
...@@ -39,10 +39,8 @@ namespace Mall.Common ...@@ -39,10 +39,8 @@ namespace Mall.Common
{ {
using (stream) using (stream)
{ {
using (StreamReader input = new StreamReader(stream, enc)) using StreamReader input = new StreamReader(stream, enc);
{ using CsvReader csv = new CsvReader(input, true);
using (CsvReader csv = new CsvReader(input, true))
{
DataTable dt = new DataTable(); DataTable dt = new DataTable();
//第一行字段数量 //第一行字段数量
int columnCount = csv.FieldCount; int columnCount = csv.FieldCount;
...@@ -70,7 +68,5 @@ namespace Mall.Common ...@@ -70,7 +68,5 @@ namespace Mall.Common
} }
} }
} }
}
}
} }
...@@ -444,8 +444,6 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={use ...@@ -444,8 +444,6 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={use
/// <returns></returns> /// <returns></returns>
public RB_Member_User_Extend GetMemberUserEntityRepository(RB_Member_User_Extend query) public RB_Member_User_Extend GetMemberUserEntityRepository(RB_Member_User_Extend query)
{ {
StringBuilder builder = new StringBuilder();
string where = " 1=1 "; string where = " 1=1 ";
if (query.TenantId > 0) if (query.TenantId > 0)
{ {
...@@ -519,10 +517,6 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={use ...@@ -519,10 +517,6 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={use
{ {
where += $@" and {nameof(RB_Member_User.MallBaseId)}={dmodel.MallBaseId}"; where += $@" and {nameof(RB_Member_User.MallBaseId)}={dmodel.MallBaseId}";
} }
//if (dmodel.Id > 0)
//{
// where += $@" and {nameof(RB_Member_User.Id)}={dmodel.Id}";
//}
if (!string.IsNullOrEmpty(dmodel.Name)) if (!string.IsNullOrEmpty(dmodel.Name))
{ {
where += $@" and ({nameof(RB_Member_User.Name)} like '%{dmodel.Name}%' or {nameof(RB_Member_User.Id)} like '%{dmodel.Name}%')"; where += $@" and ({nameof(RB_Member_User.Name)} like '%{dmodel.Name}%' or {nameof(RB_Member_User.Id)} like '%{dmodel.Name}%')";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment