diff --git a/MDM/Controllers/Plant/PlantWorkshopController.cs b/MDM/Controllers/Plant/PlantWorkshopController.cs index 28fec70..73ba9de 100644 --- a/MDM/Controllers/Plant/PlantWorkshopController.cs +++ b/MDM/Controllers/Plant/PlantWorkshopController.cs @@ -116,9 +116,9 @@ namespace MDM.Controllers.Plant /// 工厂code /// [HttpGet("get_factory_site")] - public IActionResult GetFactorySite(string site_code) + public IActionResult GetFactorySite() { - var response = _PlantWorkshopService.GetFactorySite(site_code); + var response = _PlantWorkshopService.GetFactorySite(); return SUCCESS(response); } diff --git a/MDM/Services/Plant/IService/IPlantWorkshopService.cs b/MDM/Services/Plant/IService/IPlantWorkshopService.cs index cb47a57..7c46d89 100644 --- a/MDM/Services/Plant/IService/IPlantWorkshopService.cs +++ b/MDM/Services/Plant/IService/IPlantWorkshopService.cs @@ -19,6 +19,6 @@ namespace MDM.Services.IPlantService int UpdatePlantWorkshop(PlantWorkshop parm); - List GetFactorySite(string site_code); + List GetFactorySite(); } } diff --git a/MDM/Services/Plant/PlantWorkshopService.cs b/MDM/Services/Plant/PlantWorkshopService.cs index cdf3ac8..d73e789 100644 --- a/MDM/Services/Plant/PlantWorkshopService.cs +++ b/MDM/Services/Plant/PlantWorkshopService.cs @@ -87,9 +87,13 @@ namespace MDM.Services.Plant return Update(model, true); } - public List GetFactorySite(string site_code) + //public List GetFactorySite(string site_code) + //{ + // return Context.Queryable().WhereIF(!string.IsNullOrEmpty(site_code), it => it.SiteCode.Contains(site_code)).ToList(); + //} + public List GetFactorySite() { - return Context.Queryable().WhereIF(!string.IsNullOrEmpty(site_code), it => it.SiteCode.Contains(site_code)).ToList(); + return Context.Queryable().ToList(); } } } \ No newline at end of file