diff --git a/hyhproject/admin/model/Staffs.php b/hyhproject/admin/model/Staffs.php
index 3dff3e0..a8e8f50 100755
--- a/hyhproject/admin/model/Staffs.php
+++ b/hyhproject/admin/model/Staffs.php
@@ -34,29 +34,29 @@ class Staffs extends Base{
 
 		$code = input("post.verifyCode");
 
-//		if(!WSTVerifyCheck($code)){
-//
-//			return WSTReturn('验证码错误!');
-//
-//		}
-//
-//		$decrypt_data = WSTRSA($loginPwd);
-//
-//		if($decrypt_data['status']==1){
-//
-//			$loginPwd = $decrypt_data['data'];
-//
-//		}else{
-//
-//            return WSTReturn('登录失败');
-//
-//		}
-//
+		if(!WSTVerifyCheck($code)){
+
+			return WSTReturn('验证码错误!');
+
+		}
+
+		$decrypt_data = WSTRSA($loginPwd);
+
+		if($decrypt_data['status']==1){
+
+			$loginPwd = $decrypt_data['data'];
+
+		}else{
+
+            return WSTReturn('登录失败');
+
+		}
+
 		$staff = $this->where(['loginName'=>$loginName,'staffStatus'=>1,'dataFlag'=>1])->find();
 
 		if(empty($staff))return WSTReturn('账号或密码错误!');
 
-//		if($staff['loginPwd']==md5($loginPwd.$staff['secretKey'])){
+		if($staff['loginPwd']==md5($loginPwd.$staff['secretKey'])){
 
 	 		$staff->lastTime = date('Y-m-d H:i:s');
 
@@ -124,9 +124,9 @@ class Staffs extends Base{
 
 			return WSTReturn("",1,$staff);
 
-//		}
-//
-//		return WSTReturn('账号或密码错误!');
+		}
+
+		return WSTReturn('账号或密码错误!');
 
 	}