设备监控

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfTermServiceImpl.java

@@ -90,6 +90,7 @@ public class XfTermServiceImpl implements IXfTermService {
             }
         }
         lqw.in(CollectionUtil.isNotEmpty(roomIds),"t.room_id", roomIds);
+        lqw.eq("t.del_flag", 0);
         Page<XfTermVo> result = baseMapper.customPageList(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
@@ -143,7 +144,7 @@ public class XfTermServiceImpl implements IXfTermService {
         lqw.like(StringUtils.isNotBlank(bo.getTermName()), XfTerm::getTermName, bo.getTermName());
         lqw.eq(StringUtils.isNotBlank(bo.getTermIp()), XfTerm::getTermIp, bo.getTermIp());
 
-        lqw.orderByAsc(XfTerm::getTermName);
+        lqw.orderByAsc(XfTerm::getTermNo);
         return lqw;
     }