| 
					
				 | 
			
			
				@@ -57,12 +57,7 @@ $group = function() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 $company_group = function()  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	$company = Dever::load('manage/company.get'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	$where = array(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	if ($company > 1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		$where['id'] = $company; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	$data = Dever::db('manage/company')->all($where); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	$data = Dever::db('manage/company')->all(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	if ($data) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		foreach ($data as $k => $v) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			$data[$k]['child'] = Dever::db('manage/group')->all(array('company_id' => $v['id'])); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -237,6 +232,7 @@ return array 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			'list'		=> true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		/* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		'company_id'       => array 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             'type'      => 'int-11', 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -245,7 +241,7 @@ return array 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             'desc'      => '所属公司', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             'match'     => 'is_numeric', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             'update'    => 'hidden', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        ), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        ),*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		'username'		=> array 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		( 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -803,7 +799,7 @@ return array 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	'manage' => array 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		# 设置公司权限 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		'company' => 'company_id', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		//'company' => 'company_id', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		# 后台提交时,检测该值是否为空,多个用逗号隔开 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //'update_check' => 'scm_servicer-out_order_goods', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		# 不展示保存按钮 
			 |