edit

admin/page/origin.py

@@ -40,6 +40,7 @@ class batch_path(Load):
 		self.commonList('origin_batch')
 		if self.data['list']:
 			for key, value in enumerate(self.data['list']):
+				self.data['list'][key]['land'] = '未知'
 				farm = farm_list[value['farm_id']]
 				self.data['list'][key]['farm'] = farm['name']
 				device = gateway[value['gateway_id']]

admin/page/work.py

@@ -23,16 +23,31 @@ class work_path(Load):
 		)
 		self.data['common']['search_farm_id-select-'] = Demeter.config['setting']['farmList']
 		self.data['common']['search_category_id-select-'] = self.service('common').list('farm_work_category')
+
+		farm_list = {}
+		for value in self.data['common']['search_farm_id-select-']:
+			farm_list[value['id']] = value
+
+		gateway = {}
+		for value in self.data['common']['search_category_id-select-']:
+			gateway[value['id']] = value
+
+		farm_work_land = {}
+		for value in self.data['common']['search_land_id-select-']:
+			farm_work_land[value['id']] = value
+
 		self.commonList('farm_work')
 		if self.data['list']:
 			for key, value in enumerate(self.data['list']):
-				farm = self.service('common').one('farm', id=value['farm_id'])
+				self.data['list'][key]['land'] = '未知'
+				farm = farm_list[value['farm_id']]
 				self.data['list'][key]['farm'] = farm['name']
 				category = self.service('common').one('farm_work_category', id=value['category_id'])
 				self.data['list'][key]['category'] = category['name']
-				land = self.service('common').one('farm_work_land', id=value['land_id'])
-				if land:
-					self.data['list'][key]['land'] = land['name']
+				if value['land_id'] in farm_work_land:
+					land = farm_work_land[value['land_id']]
+					if land:
+						self.data['list'][key]['land'] = land['name']
 		self.commonView('list')
 
 class work_update_path(Load):