企业管理添加筛选

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java

@@ -127,9 +127,9 @@ public class CompanyController extends BaseController {
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "企业信息表分页查询",  notes = "企业信息表分页查询")
 	public ResponseModel<Page<CompanyDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size,String name) {
+                    (value = "size") int size,CompanyDto companyDto) {
 
-		return ResponseHelper.buildResponse(companyServiceImpl.queryCompanyPage(current,size,name));
+		return ResponseHelper.buildResponse(companyServiceImpl.queryCompanyPage(current,size,companyDto));
 	}
 
 	/**

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java

@@ -44,17 +44,18 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
     /**
      * 分页查询+筛选
      */
-    public Page<CompanyDto> queryCompanyPage(int current, int size, String name) {
+        public Page<CompanyDto> queryCompanyPage(int current, int size, CompanyDto companyDto) {
         Page<CompanyDto> page = new Page<>();
         page.setSize(size);
         page.setCurrent(current);
         Page<CompanyDto> page1 = queryForPage(page, null, false);
 
-        if (name != null) {
-            List<CompanyDto> collect = page1.getRecords().stream().filter(a -> a.getName().equals(name)).collect(Collectors.toList());
+        if (companyDto.getName() != null) {
+            List<CompanyDto> collect = page1.getRecords().stream().filter(a -> a.getName().equals(companyDto.getName())).collect(Collectors.toList());
             page1.setRecords(collect);
         }
 
+
         return page1;
     }
 }
\ No newline at end of file