Merge branch 'master' of http://192.168.1.12:3000/caipin/cld

protected/controller/AdminController.php

@@ -1277,10 +1277,15 @@ function excelTime($date, $time = false)
 		}
 		$idname = $name = $pinyinname = array();
 		foreach($_POST['staff'] as $k => $v){
-
-			array_push($idname)
+			$msg = explode(':',$v);
+			array_push($idname,$msg[0]);
+			array_push($name,$msg[1]);
+			array_push($pinyinname,$msg[2]);
 		}
-
+		var_dump($idname);
+		var_dump($name);
+		var_dump($pinyinname);
+		exit;
 		Doo::loadModel("holidayacman");
 		$acman=new HACMan();
 		$acman->typename = $_POST['title'];