修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/RiskSourceSceneController.java

@@ -261,9 +261,9 @@ public class RiskSourceSceneController extends AbstractBaseController {
             @RequestParam(value = "pageNumber") int pageNumber,
             @RequestParam(value = "pageSize") int pageSize,
             @RequestParam(value = "sourceId") String sourceId,
-            @RequestParam(value = "categoryId") String categoryId,
-            @RequestParam(value = "equipCode") String equipCode,
-            @RequestParam(value = "equipName") String equipName
+            @RequestParam(value = "categoryId" ,required = false) String categoryId,
+            @RequestParam(value = "equipCode",required = false) String equipCode,
+            @RequestParam(value = "equipName",required = false) String equipName
     ) {
         Page page = new Page(pageNumber, pageSize);
         return iRiskSourceSceneService.getEquipBySourceId(page, sourceId,categoryId,equipCode,equipName);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/RiskSourceSceneServiceImpl.java

@@ -673,7 +673,7 @@ public class RiskSourceSceneServiceImpl extends ServiceImpl<RiskSourceSceneMappe
             categoryIdList = categorieChildren.stream().map(category -> category.getId()).collect(Collectors.toList());
             categoryIdList.add(categoryRoot);
         }
-        List<HashMap<String,Object>> equipmentList = equipmentSpecificMapper.getEquipBySourceId(idsList, categoryIdList, equipCode.replace(" ", ""), equipName.replace(" ", ""));
+        List<HashMap<String,Object>> equipmentList = equipmentSpecificMapper.getEquipBySourceId(idsList, categoryIdList,equipCode == null ?equipCode = " ".replace(" ", ""):null, equipName == null ? equipName = " ".replace(" ", ""): null);
         page.setTotal(equipmentList.size());
         page.setRecords(equipmentList);
         return page;