Browse Source

批量位号完善

guarantee-lsq 2 years ago
parent
commit
73ff37d060

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

@@ -797,8 +797,13 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         if(list != null && list.size() > 0){
             list.forEach(item -> {
                 // 子设备且父设备在maps中不添加
-                if(item.getIsChild() != null && item.getIsChild() == 1){
+                if(StringUtils.isNotBlank(item.getParentId())){
+                    // 子设备
                     if(StringUtils.isBlank(maps.get(item.getParentId()))){
+                        // 获取子设备
+                        SbInfoDTO query = new SbInfoDTO();
+                        query.setParentId(item.getId());
+                        item.setChildren(mapper.selectVOList(query));
                         resultList.add(item);
                     }
                 }else{