diff --git a/DOAN.Admin.WebApi/Controllers/TenantController.cs b/DOAN.Admin.WebApi/Controllers/TenantController.cs
index f21cb58..9b4a0e3 100644
--- a/DOAN.Admin.WebApi/Controllers/TenantController.cs
+++ b/DOAN.Admin.WebApi/Controllers/TenantController.cs
@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using DOAN.Service.IService;
using SqlSugar;
+using DOAN.Model;
namespace DOAN.Admin.WebApi.Controllers
{
///
@@ -12,6 +13,8 @@ namespace DOAN.Admin.WebApi.Controllers
public class TenantController : BaseController
{
private ITenantService tenantService;
+
+
public TenantController(ITenantService tenantService)
{
this.tenantService = tenantService;
diff --git a/DOAN.Model/huate_group/MasterDataManagement/BasePartnumber.cs b/DOAN.Model/huate_group/MasterDataManagement/BasePartnumber.cs
index a2a58ca..81b4a22 100644
--- a/DOAN.Model/huate_group/MasterDataManagement/BasePartnumber.cs
+++ b/DOAN.Model/huate_group/MasterDataManagement/BasePartnumber.cs
@@ -23,7 +23,7 @@ namespace DOAN.Model.huate_group.MasterDataManagement
/// 租户号
///
[SugarColumn(ColumnName = "tENANT_ID")]
- public string TenantId { get; set; }
+ public int TenantId { get; set; }
///
/// 创建人
diff --git a/DOAN.Model/huate_group/MasterDataManagement/Dto/BasePartnumberDto.cs b/DOAN.Model/huate_group/MasterDataManagement/Dto/BasePartnumberDto.cs
index 52bbcd3..206b88b 100644
--- a/DOAN.Model/huate_group/MasterDataManagement/Dto/BasePartnumberDto.cs
+++ b/DOAN.Model/huate_group/MasterDataManagement/Dto/BasePartnumberDto.cs
@@ -6,6 +6,8 @@ namespace DOAN.Model.huate_group.MasterDataManagement.Dto
///
public class BasePartnumberQueryDto : PagerInfo
{
+ public string PartnumberName { get; set; }
+ public int TenantId { get; set; }
}
///
@@ -18,7 +20,7 @@ namespace DOAN.Model.huate_group.MasterDataManagement.Dto
public string PartnumberName { get; set; }
- public string TenantId { get; set; }
+ public int TenantId { get; set; }
public string CreatedBy { get; set; }
diff --git a/DOAN.Model/huate_group/MasterDataManagement/Dto/BaseVehiclemodelDto.cs b/DOAN.Model/huate_group/MasterDataManagement/Dto/BaseVehiclemodelDto.cs
index d28a1b5..34cc0af 100644
--- a/DOAN.Model/huate_group/MasterDataManagement/Dto/BaseVehiclemodelDto.cs
+++ b/DOAN.Model/huate_group/MasterDataManagement/Dto/BaseVehiclemodelDto.cs
@@ -6,6 +6,9 @@ namespace DOAN.Model.huate_group.MasterDataManagement.Dto
///
public class BaseVehiclemodelQueryDto : PagerInfo
{
+ public string VehicelModelName { get; set; }
+
+ public int? TenantId { get; set; }
}
///
diff --git a/DOAN.Service/huate_group/MasterDataManagement/BasePartnumberService.cs b/DOAN.Service/huate_group/MasterDataManagement/BasePartnumberService.cs
index cc4791b..32c286b 100644
--- a/DOAN.Service/huate_group/MasterDataManagement/BasePartnumberService.cs
+++ b/DOAN.Service/huate_group/MasterDataManagement/BasePartnumberService.cs
@@ -72,7 +72,11 @@ namespace DOAN.Service.huate_group.MasterDataManagement
///
private static Expressionable QueryExp(BasePartnumberQueryDto parm)
{
- var predicate = Expressionable.Create();
+ var predicate = Expressionable.Create()
+
+ .AndIF(parm != null && parm.TenantId > 0, it => it.TenantId == parm.TenantId)
+ .AndIF(parm != null && !string.IsNullOrEmpty(parm.PartnumberName), it => it.PartnumberName.Contains(parm.PartnumberName));
+ ;
return predicate;
}
diff --git a/DOAN.Service/huate_group/MasterDataManagement/BaseVehiclemodelService.cs b/DOAN.Service/huate_group/MasterDataManagement/BaseVehiclemodelService.cs
index 48699b1..568550c 100644
--- a/DOAN.Service/huate_group/MasterDataManagement/BaseVehiclemodelService.cs
+++ b/DOAN.Service/huate_group/MasterDataManagement/BaseVehiclemodelService.cs
@@ -21,7 +21,9 @@ namespace DOAN.Service.huate_group.MasterDataManagement
///
public PagedInfo GetList(BaseVehiclemodelQueryDto parm)
{
- var predicate = QueryExp(parm);
+ var predicate = QueryExp(parm)
+
+ ;
var response = Queryable()
.Where(predicate.ToExpression())
@@ -72,7 +74,10 @@ namespace DOAN.Service.huate_group.MasterDataManagement
///
private static Expressionable QueryExp(BaseVehiclemodelQueryDto parm)
{
- var predicate = Expressionable.Create();
+ var predicate = Expressionable.Create()
+ .AndIF(parm!=null&&parm.TenantId>0,it=>it.TenantId == parm.TenantId)
+ .AndIF(parm!=null&&!string.IsNullOrEmpty(parm.VehicelModelName), it=>it.VehicelModelName.Contains(parm.VehicelModelName));
+ ;
return predicate;
}