Merge remote-tracking branch 'origin/master'

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

@@ -73,9 +73,12 @@ 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.eq(tpmEquipment.getId() != null && !"".equals(tpmEquipment.getId()),"id",tpmEquipment.getId());
 		//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);
@@ -190,12 +193,12 @@ public class TpmEquipmentController extends JeecgController<TpmEquipment, ITpmEq
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, TpmEquipment.class);
     }
-    
+
     /**
     *   author: dzc
     *   version: 1.0
     *   des: 查询设备下拉列表
-    *   date: 2024/4/17 
+    *   date: 2024/4/17
     */
 	@ApiOperation(value="设备档案-查询设备下拉列表", notes="设备档案-查询设备下拉列表")
 	@GetMapping(value = "/selectEquipmentList")