xiongchao 4 жил өмнө
parent
commit
4b2a90a20a

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/enums/SbInfoChildEnum.java

@@ -22,7 +22,7 @@ public enum SbInfoChildEnum {
      */
     IS_PARENT(2),
     /**
-     * 普通设备
+     * 单体设备
      */
     IS_NORMAL(3);
 

+ 2 - 2
platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -605,7 +605,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         }
         PageHelper.startPage(pageNum, pageSize);
         List<SbInfoVO> sbList = mapper.selectVOList(model);
-        /*if(SbInfoChildEnum.IS_PARENT.getValue().equals(model.getIsChild()) && !CollectionUtils.isEmpty(sbList)){
+        if(SbInfoChildEnum.IS_PARENT.getValue().equals(model.getIsChild()) && !CollectionUtils.isEmpty(sbList)){
             for(SbInfoVO vo: sbList){
                 if(SbInfoChildEnum.IS_PARENT.getValue().equals(vo.getIsChild())){
                     SbInfoDTO infoDTO = new SbInfoDTO();
@@ -616,7 +616,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                     }
                 }
             }
-        }*/
+        }
         return new MyVOPage<>(sbList);
     }