diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js b/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js
index 67cda90d8..385ac1ad9 100644
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/validate/jquery.validate.extend.js
@@ -1,8 +1,16 @@
 /*this is basic form validation using for validation person's basic information author:Clara Guo data:2017/07/20*/
 $(document).ready(function(){
 	$.validator.setDefaults({       
-		  submitHandler: function(form) {    
-		 		form.submit();    
+        focusInvalid:true,
+		onfocusout: false,
+	    invalidHandler: function(form, validator) {
+	        var errors = validator.numberOfInvalids();
+	        if (errors) {                    
+	            validator.errorList[0].element.focus();
+	        }
+	    },
+		submitHandler: function(form) {    
+		 	form.submit();    
 		}       
 	});  
 	//手机号码验证身份证正则合并：(^\d{15}$)|(^\d{17}([0-9]|X)$)
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
index e3b7a97aa..817f46eb3 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
@@ -436,7 +436,16 @@ var sub = {
     	        var textareaValue = $(columns[i]).find('textarea');
     	        var key = dataColumns[i].field;
     	        if ($.common.isNotEmpty(inputValue.val())) {
-    	            obj[key] = inputValue.val();
+                    var inputType = inputValue.attr("type");
+    	        	if(inputType === 'checkbox'){
+    	        		if(inputValue.is(':checked')) {
+        	        		obj[key] = inputValue.val();
+        	        	}else{
+        	        		obj[key] = '';
+        	        	}
+    	        	}else{
+    	        		obj[key] = inputValue.val();
+    	        	}
     	        } else if ($.common.isNotEmpty(selectValue.val())) {
     	            obj[key] = selectValue.val();
     	        } else if ($.common.isNotEmpty(textareaValue.val())) {