|
@@ -9522,14 +9522,14 @@ FROM
|
|
|
sw.Start();
|
|
|
|
|
|
int provinceId = dto.ProvinceId;
|
|
|
- if (provinceId < 1) provinceId = 1408; // 默认四川
|
|
|
+ if (provinceId < 1) provinceId = 122; // 默认四川
|
|
|
|
|
|
RefAsync<int> total = 0;
|
|
|
|
|
|
var data = await _sqlSugar.Queryable<Grp_NationalTravelFee>()
|
|
|
.LeftJoin<Sys_SetData>((ntf, sd) => ntf.Currency == sd.Id)
|
|
|
.LeftJoin<Sys_Users>((ntf, sd, u) => ntf.CreateUserId == u.Id)
|
|
|
- .LeftJoin<Sys_SetData>((ntf, sd, u, sd1) => ntf.ProvinceId == sd1.Id)
|
|
|
+ .LeftJoin<Sys_Cities>((ntf, sd, u, sd1) => ntf.ProvinceId == sd1.Id)
|
|
|
.Where((ntf, sd, u, sd1) => ntf.IsDel == 0 && ntf.ProvinceId == provinceId)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Search), (ntf, sd, u, sd1) => dto.Search.Contains(ntf.Country) || dto.Search.Contains(ntf.City))
|
|
|
.Select((ntf, sd, u, sd1) => new
|