rabin 7 年之前
父节点
当前提交
d8e35cc1f2
共有 2 个文件被更改,包括 7 次插入7 次删除
  1. 1 1
      front/api/origin.py
  2. 6 6
      front/api/work.py

+ 1 - 1
front/api/origin.py

@@ -75,7 +75,7 @@ class index_path(Load):
 	@auth
 	@Web.setting
 	def get(self):
-		self.data['list'] = self.service('common').list('origin_batch', state=True, page=True)
+		self.data['list'] = self.service('common').list('origin_batch', state=True, page=True, search={'farm_id': Demeter.config['setting']['farm']})
 		if self.data['list']:
 			for key, value in enumerate(self.data['list']):
 				self.data['list'][key] = Origin.get(self, value)

+ 6 - 6
front/api/work.py

@@ -39,7 +39,7 @@ class index_path(Load):
 	@auth
 	@Web.setting
 	def get(self):
-		self.data['list'] = self.service('common').list('farm_work', state=True)
+		self.data['list'] = self.service('common').list('farm_work', state=True, search={'farm_id': Demeter.config['setting']['farm']})
 		if self.data['list']:
 			for key, value in enumerate(self.data['list']):
 				self.data['list'][key]['workdates'] = Demeter.date(value['workdate'], '%Y-%m-%d')
@@ -162,7 +162,7 @@ class land_path(Load):
 	@auth
 	@Web.setting
 	def get(self):
-		self.data['list'] = self.service('common').list('farm_work_land', state=True)
+		self.data['list'] = self.service('common').list('farm_work_land', state=True, search={'farm_id': Demeter.config['setting']['farm']})
 		self.out('yes', self.data)
 
 	"""
@@ -246,11 +246,11 @@ class land_pic_path(Load):
 	@auth
 	@Web.setting
 	def get(self):
-		self.data['list'] = self.service('common').list('farm_work_land', state=True)
-		#self.data['list'] = self.service('common').list('farm_work_land_pic', state=True)
+		self.data['list'] = self.service('common').list('farm_work_land', state=True, search={'farm_id': Demeter.config['setting']['farm']})
+		#self.data['list'] = self.service('common').list('farm_work_land_pic', state=True, search={'farm_id': Demeter.config['setting']['farm']})
 		if self.data['list']:
 			for key, value in enumerate(self.data['list']):
-				self.data['list'][key]['pic'] = self.service('common').list('farm_work_land_pic', search={'land_id':value['id']}, state=True)
+				self.data['list'][key]['pic'] = self.service('common').list('farm_work_land_pic', search={'farm_id': Demeter.config['setting']['farm'], 'land_id':value['id']}, state=True)
 		self.out('yes', self.data)
 
 	"""
@@ -336,7 +336,7 @@ class category_path(Load):
 	@auth
 	@Web.setting
 	def get(self):
-		self.data['list'] = self.service('common').list('farm_work_category', state=True)
+		self.data['list'] = self.service('common').list('farm_work_category', state=True, search={'farm_id': Demeter.config['setting']['farm']})
 		self.out('yes', self.data)
 
 	"""