Browse Source

fix传感器型号查询

LLL 1 year ago
parent
commit
9230ae1a7f

+ 2 - 0
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/chuanganqi/controller/ItdmChuanganqiController.java

@@ -83,6 +83,7 @@ public class ItdmChuanganqiController extends JeecgController<ItdmChuanganqi, II
 														HttpServletRequest req) {
 		 ItdmChuanganqi itdmChuanganqi1 = new ItdmChuanganqi();
 		 QueryWrapper<ItdmChuanganqi> queryWrapper = QueryGenerator.initQueryWrapper(itdmChuanganqi1, req.getParameterMap());
+		 queryWrapper.lambda().like(StringUtils.isNoneBlank(itdmChuanganqi.getXinghao()),ItdmChuanganqi::getXinghao,itdmChuanganqi.getXinghao());
 		 queryWrapper.lambda().like(StringUtils.isNoneBlank(itdmChuanganqi.getXuliehao()),ItdmChuanganqi::getXuliehao,itdmChuanganqi.getXuliehao());
 
 		 queryWrapper.le("youxiaoqi", new Date()); // 查询有效期小于等于当前时间的设备
@@ -122,6 +123,7 @@ public class ItdmChuanganqiController extends JeecgController<ItdmChuanganqi, II
 								   HttpServletRequest req) {
 		ItdmChuanganqi itdmChuanganqi1 = new ItdmChuanganqi();
 		QueryWrapper<ItdmChuanganqi> queryWrapper = QueryGenerator.initQueryWrapper(itdmChuanganqi1, req.getParameterMap());
+		queryWrapper.lambda().like(StringUtils.isNoneBlank(itdmChuanganqi.getXinghao()),ItdmChuanganqi::getXinghao,itdmChuanganqi.getXinghao());
 		queryWrapper.lambda().like(StringUtils.isNoneBlank(itdmChuanganqi.getXuliehao()),ItdmChuanganqi::getXuliehao,itdmChuanganqi.getXuliehao());
 		Page<ItdmChuanganqi> page = new Page<ItdmChuanganqi>(pageNo, pageSize);
 		IPage<ItdmChuanganqi> pageList = itdmChuanganqiService.page(page, queryWrapper);