Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/IotInfoController.java

@@ -82,7 +82,7 @@ public class IotInfoController {
         return success(BeanUtils.toBean(pageResult, IotInfoRespVO.class));
     }
 
-    @GetMapping("/file/page")
+    @PostMapping("/file/page")
     @Operation(summary = "获得资料分页")
     @PreAuthorize("@ss.hasPermission('rq:iot-info:query')")
     public CommonResult<PageResult<IotInfoRespVO>> getIotInfoFilePage(@Valid IotInfoPageReqVO pageReqVO) {

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotmaterial/IotMaterialMapper.java

@@ -47,8 +47,9 @@ public interface IotMaterialMapper extends BaseMapperX<IotMaterialDO> {
     default PageResult<IotMaterialDO> getMaterialsByBomId(IotMaterialPageReqVO reqVO) {
         MPJLambdaWrapperX<IotMaterialDO> query = new MPJLambdaWrapperX<IotMaterialDO>();
         query.leftJoin(IotDeviceMaterialDO.class, IotDeviceMaterialDO::getMaterialId, IotMaterialDO::getId)
-                .eq(ObjectUtil.isNotNull(reqVO.getBomId()), IotDeviceMaterialDO::getBomNodeId, reqVO.getBomId());
+                .eq(ObjectUtil.isNotNull(reqVO.getBomId()), IotDeviceMaterialDO::getBomNodeId, reqVO.getBomId())
+                .like(IotDeviceMaterialDO::getName, reqVO.getName());
         return selectJoinPage(reqVO, IotMaterialDO.class, query);
     }
 
-}
+}