Jelajahi Sumber

mxg:combine all file

mengxiangge 5 tahun lalu
induk
melakukan
77d6846ba6

+ 2 - 2
src/system_relation/system_block.py

@@ -74,7 +74,7 @@ def dic2obj(d):
 
 
 def list_to_dict(lis):
-	ids = [idx.id for idx in lis]
+	ids = [idx.id for idx in lis if idx.id]
 	dic = dict(zip(ids, lis))
 	return dic
 
@@ -522,7 +522,7 @@ class FloorGraph:
 	"""
 
 	def __init__(self,model, system_name, domain,floor_connectors,element_data):
-		self.model=model;
+		self.model=model
 		self.system_name = system_name
 		self.domain = domain
 		floor_connectors = sort_connectors(floor_connectors)

+ 1 - 1
src/system_relation/systemutils.py

@@ -63,7 +63,7 @@ def dic2obj(d):
 
 
 def list_to_dict(lis):
-	ids = [idx.id for idx in lis]
+	ids = [idx.id for idx in lis if idx.id]
 	dic = dict(zip(ids, lis))
 	return dic