Merge remote-tracking branch 'origin/master'

shares/js/yw/eu/userModule.js

@@ -389,29 +389,31 @@ function validateFace(){
 		var serialno = $(this).val();
 		var attendance_id = $(this).next().val();
 		var id = $(this).parent().attr("id");
-		if(serialno.length > 0  && attendance_id == '') {
-			addFieldError(id,"请输入考勤ID!");
-			b = false;
-		} else {
-			var r = serialno+"_"+"attendance_id";
-			if(r!="_"){
-				if(temp =="") {
-					temp = r;
-				} else if(temp.indexOf(r)!=-1){
-					addFieldError(id,"该设备已选择!");
-					b = false;
-				} else {
-					temp += ","+r;
+		if(serialno.length > 0) {
+			if(attendance_id == '') {
+				addFieldError(id,"请输入考勤ID!");
+				b = false;
+			} else {
+				var r = serialno+"_"+"attendance_id";
+				if(r!="_"){
+					if(temp =="") {
+						temp = r;
+					} else if(temp.indexOf(r)!=-1){
+						addFieldError(id,"该设备已选择!");
+						b = false;
+					} else {
+						temp += ","+r;
+					}
+					var url = "checkMessage.do?date="+new Date()+"&action=checkAttendanceId"; 
+					var param = {'userId':userId,'attendance_id':attendance_id, 'serialno':serialno};
+					sendAjaxParam(param,url,"text",function(data) {
+						if(data != null && data !=""){
+							console.log(data,"考勤data")
+							addFieldError(id, data);
+					        b = false ;
+					    }
+					});
 				}
-				var url = "checkMessage.do?date="+new Date()+"&action=checkAttendanceId"; 
-				var param = {'userId':userId,'attendance_id':attendance_id, 'serialno':serialno};
-				sendAjaxParam(param,url,"text",function(data) {
-					if(data != null && data !=""){
-						console.log(data,"考勤data")
-						addFieldError(id, data);
-				        b = false ;
-				    }
-				});
 			}
 		}