Commit 97d459939006d4e539db2a23a5cca3f3b661bcc9

Authored by 648540858
1 parent 5e4a673e

修复二级目录添加失败的问题

src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java
@@ -47,7 +47,7 @@ public interface PlatformCatalogMapper { @@ -47,7 +47,7 @@ public interface PlatformCatalogMapper {
47 PlatformCatalog selectDefaultByPlatFormId(String platformId); 47 PlatformCatalog selectDefaultByPlatFormId(String platformId);
48 48
49 49
50 - @Select("SELECT pc.* FROM platform_catalog pc WHERE pc.id = #{id}") 50 + @Select("SELECT pc.* FROM platform_catalog pc WHERE pc.id = #{id}")
51 PlatformCatalog selectParentCatalog(String id); 51 PlatformCatalog selectParentCatalog(String id);
52 52
53 @Select("SELECT pc.id as channelId, pc.name, pc.civilCode, pc.businessGroupId,'1' as parental, pc.parentId " + 53 @Select("SELECT pc.id as channelId, pc.name, pc.civilCode, pc.businessGroupId,'1' as parental, pc.parentId " +
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
@@ -708,7 +708,7 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { @@ -708,7 +708,7 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage {
708 platformCatalog.setParentId(platform.getDeviceGBId()); 708 platformCatalog.setParentId(platform.getDeviceGBId());
709 }else { 709 }else {
710 // 获取顶层的 710 // 获取顶层的
711 - PlatformCatalog topCatalog = getTopCatalog(platformCatalog.getParentId(), platformCatalog.getPlatformId()); 711 + PlatformCatalog topCatalog = getTopCatalog(platformCatalog.getParentId(), platform.getDeviceGBId());
712 platformCatalog.setBusinessGroupId(topCatalog.getId()); 712 platformCatalog.setBusinessGroupId(topCatalog.getId());
713 } 713 }
714 } 714 }