no commit message

webmain/model/flow/hrsalaryModel.php

@@ -219,7 +219,7 @@ class flow_hrsalaryClassModel extends flowModel
 	}
 	
 	//导入之前判断
-	public function flowdaorubefore($rows)
+	public function flowdaorubefore($rows, &$errdata)
 	{
 		$inarr	= array();
 		$uarra	= array();
@@ -231,10 +231,16 @@ class flow_hrsalaryClassModel extends flowModel
 			
 			$arr 	= $rs;
 			$urs 	= $this->adminmodel->getone("`name`='$name'");
-			if(!$urs)continue;
+			if(!$urs){
+				$errdata[$rs['drxu']] = '('.$name.')用户不存在';
+				continue;
+			}
 			
 			$to 	= $this->rows("`xuid`='".$urs['id']."' and `month`='$month'");
-			if($to>0)continue;//已经存在了
+			if($to>0){
+				$errdata[$rs['drxu']] = '('.$name.'的'.$month.')已经存在了';
+				continue;//已经存在了
+			}
 			
 			$arr['month'] = $month;
 			$arr['xuid'] = $urs['id'];