fix设备档案查询

module_tpm/src/main/java/org/jeecg/modules/tpmEquipment/controller/TpmEquipmentController.java

@@ -73,8 +73,11 @@ public class TpmEquipmentController extends JeecgController<TpmEquipment, ITpmEq
 		TpmEquipment tpmEquipment1 = new TpmEquipment();
 		tpmEquipment1.setEquipmentcode(tpmEquipment.getEquipmentcode());
 		tpmEquipment1.setEquipmenttreeid(tpmEquipment.getEquipmenttreeid());
+		tpmEquipment1.setSpaceid(tpmEquipment.getSpaceid());
 		QueryWrapper<TpmEquipment> queryWrapper = QueryGenerator.initQueryWrapper(tpmEquipment1, req.getParameterMap());
 		queryWrapper.like(tpmEquipment.getEquipmentname()!=null && !"".equals(tpmEquipment.getEquipmentname()),"equipmentname",tpmEquipment.getEquipmentname());
+		queryWrapper.like(tpmEquipment.getSpec()!=null && !"".equals(tpmEquipment.getSpec()),"spec",tpmEquipment.getSpec());
+		queryWrapper.like(tpmEquipment.getAddress()!=null && !"".equals(tpmEquipment.getAddress()),"address",tpmEquipment.getAddress());
 		Page<TpmEquipment> page = new Page<TpmEquipment>(pageNo, pageSize);
 		IPage<TpmEquipment> pageList = tpmEquipmentService.page(page, queryWrapper);
 		return Result.OK(pageList);