|
@@ -82,7 +82,7 @@ public class TpmTagController extends JeecgController<TpmTag, ITpmTagService> {
|
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
|
HttpServletRequest req) {
|
|
|
TpmTag tpmTag1 = new TpmTag();
|
|
|
- tpmTag1.setEnergyitemid(tpmTag.getEnergyitemid());
|
|
|
+ tpmTag1.setEquipmentid(tpmTag.getEquipmentid());
|
|
|
QueryWrapper<TpmTag> queryWrapper = QueryGenerator.initQueryWrapper(tpmTag1, req.getParameterMap());
|
|
|
queryWrapper.like(tpmTag.getTagname()!=null && !"".equals(tpmTag.getTagname()),"tagname",tpmTag.getTagname());
|
|
|
Page<TpmTag> page = new Page<TpmTag>(pageNo, pageSize);
|