焊工页面筛选

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

@@ -141,9 +141,15 @@ public class WelderController extends BaseController {
         IPage companyWelder = orgServiceImpl.getCompanyWelder(page);
 
         List<WelderDto> welderRecords = companyWelder.getRecords();
-        List<WelderDto> result = welderRecords.stream().filter(w -> !w.getName().equals(name) && !w.getIdNumber().equals(idNumber)
-                && !w.getLicensedProject().equals(licensedProject)).collect(Collectors.toList());
-        Page records = page.setRecords(result);
+
+        //模糊查询
+        if (name!=null||idNumber!=null||licensedProject!=null){
+            if (name!=null) {welderRecords = welderRecords.stream().filter(n -> n.getName().indexOf(name)>-1).collect(Collectors.toList());}
+            if (idNumber!=null) {welderRecords = welderRecords.stream().filter(n -> n.getIdNumber().indexOf(idNumber)>-1).collect(Collectors.toList());}
+            if (licensedProject!=null) {welderRecords = welderRecords.stream().filter(n -> n.getLicensedProject().indexOf(licensedProject)>-1).collect(Collectors.toList());}
+        }
+
+        Page records = page.setRecords(welderRecords);
         return ResponseHelper.buildResponse(records);
     }