Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

service/agent/src/Children.php

@@ -129,48 +129,48 @@ class Children
 											$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['name'] = $m7['value'];
 											$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['itemStyle']['color'] = 'blue';
 										}else{
-											$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['name'] = $m7['value'];
+											// $info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['name'] = $m7['value'];
 										}
 								
-								$i7 = $this->invite($v6['to_uid']);
-								if($i7){
-									foreach($i7 as $k7 => $v7){
-										$m8 = $this->button($v7['to_uid']);
-										if($v7['to_uid'] == $uid){
-											$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['name'] = $m8['value'];
-											$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['itemStyle']['color'] = 'blue';
-										}else{
-											$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['name'] = $m8['value'];
-										}
+								// $i7 = $this->invite($v6['to_uid']);
+								// if($i7){
+								// 	foreach($i7 as $k7 => $v7){
+								// 		$m8 = $this->button($v7['to_uid']);
+								// 		if($v7['to_uid'] == $uid){
+								// 			$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['name'] = $m8['value'];
+								// 			$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['itemStyle']['color'] = 'blue';
+								// 		}else{
+								// 			$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['name'] = $m8['value'];
+								// 		}
 								
-								$i8 = $this->invite($v7['to_uid']);
-								if($i8){
-									foreach($i8 as $k8 => $v8){
-										$m9 = $this->button($v8['to_uid']);
-										if($v8['to_uid'] == $uid){
-											$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['children'][$k8]['name'] = $m9['value'];
-											$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['children'][$k8]['name']['itemStyle']['color'] = 'blue';
-										}else{
-											$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['children'][$k8]['name'] = $m9['value'];
-										}
+								// $i8 = $this->invite($v7['to_uid']);
+								// if($i8){
+								// 	foreach($i8 as $k8 => $v8){
+								// 		$m9 = $this->button($v8['to_uid']);
+								// 		if($v8['to_uid'] == $uid){
+								// 			$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['children'][$k8]['name'] = $m9['value'];
+								// 			$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['children'][$k8]['name']['itemStyle']['color'] = 'blue';
+								// 		}else{
+								// 			$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['children'][$k8]['name'] = $m9['value'];
+								// 		}
 								
-								$i9 = $this->invite($v8['to_uid']);
-								if($i9){
-									foreach($i9 as $k9 => $v9){
-										$m10 = $this->button($v9['to_uid']);
-										if($v9['to_uid'] == $uid){
-											$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['children'][$k8]['children'][$k9]['name'] = $m10['value'];
-											$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['children'][$k8]['children'][$k9]['itemStyle']['color'] = 'blue';
-										}else{
-											$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['children'][$k8]['children'][$k9]['name'] = $m10['value'];
-										}
+								// $i9 = $this->invite($v8['to_uid']);
+								// if($i9){
+								// 	foreach($i9 as $k9 => $v9){
+								// 		$m10 = $this->button($v9['to_uid']);
+								// 		if($v9['to_uid'] == $uid){
+								// 			$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['children'][$k8]['children'][$k9]['name'] = $m10['value'];
+								// 			$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['children'][$k8]['children'][$k9]['itemStyle']['color'] = 'blue';
+								// 		}else{
+								// 			$info['children'][$k]['children'][$k1]['children'][$k2]['children'][$k3]['children'][$k4]['children'][$k5]['children'][$k6]['children'][$k7]['children'][$k8]['children'][$k9]['name'] = $m10['value'];
+								// 		}
 								
-																					}
-																				}else{}
-																			}
-																		}
-																	}
-																}else{}
+								// 													}
+								// 												}else{}
+								// 											}
+								// 										}
+								// 									}
+								// 								}else{}
 															}
 														}
 													}
@@ -205,10 +205,13 @@ class Children
 			$level = Dever::db('setting/level')->find($child['level_id']);
 			$child['value'].= '（'.$level['name'].'）';
 		}
-		$source=Dever::db('setting/source')->one(array('id'=>$child['source_id'],'state'=>1));
+		if(isset($child['source_id']) && $child['source_id'] && $child['source_id']>0){
+			$source=Dever::db('setting/source')->one(array('id'=>$child['source_id'],'state'=>1));
             if($source){
                 $child['value'] .= "\r\n".$source['name'];
             }
+		}
+		
 		return $child;
 	}