Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java

@@ -79,10 +79,9 @@ public class SupplierController {
 
     @GetMapping("/list")
     @Operation(summary = "获得供应商列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
     @PreAuthorize("@ss.hasPermission('wms:supplier:query')")
-    public CommonResult<List<SupplierRespVO>> getSupplierList(@RequestParam("ids") Collection<Long> ids) {
-        List<SupplierDO> list = supplierService.getSupplierList(ids);
+    public CommonResult<List<SupplierRespVO>> getSupplierList(@Valid SupplierExportReqVO exportReqVO) {
+        List<SupplierDO> list = supplierService.getSupplierList(exportReqVO);
         return success(SupplierConvert.INSTANCE.convertList(list));
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java

@@ -81,6 +81,7 @@ public class SupplierServiceImpl implements SupplierService {
     public List<SupplierDO> getSupplierList(SupplierExportReqVO exportReqVO) {
         return supplierMapper.selectList(exportReqVO);
     }
+
     public List<SupplierImportExcelVo>  importSupplierList(List<SupplierImportExcelVo> suppliers, Integer mode, boolean updatePart) {
         if (CollUtil.isEmpty(suppliers)) {
             throw exception(SUPPLIER_IMPORT_LIST_IS_EMPTY);