diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
index 7a53192..567c558 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
@@ -72,7 +72,7 @@
 						type="text" data-date-format="yyyy-mm-dd" readonly="readonly"
 						style="width:88px;" placeholder="结束日期" title="结束日期" /></td>
 					<td style="padding-left:10px">
-					<a href="#" class="search_btn" onclick="tosearch();"><img
+					<a class="search_btn" onclick="tosearch();"><img
 					width="30px" src="static/images/search.png" /></a>
 					<!-- <a style="height:30px;"
 						class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><i
diff --git a/WebRoot/WEB-INF/jsp/system/index/login.jsp b/WebRoot/WEB-INF/jsp/system/index/login.jsp
index 82241c9..2c7f14e 100644
--- a/WebRoot/WEB-INF/jsp/system/index/login.jsp
+++ b/WebRoot/WEB-INF/jsp/system/index/login.jsp
@@ -76,12 +76,11 @@ body{
 				<div id="loginbox" >
 					<div class="name_box">
 						<input type="text"  id="username1" placeholder="账号" value="" style="opacity:0;position: absolute;top:0;height:0px;z-index:-1" autoComplete="off"/>
+						<input type="password"  id="password1" placeholder="密   码" value="" style="opacity:0;position: absolute;top:0;height:0px;z-index:-1" autoComplete="off"/>
 						<input type="text"  id="loginname" value="" placeholder="用户名"  autoComplete="off"/>
 						<svg t="1554790328236" class="icon_down" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2161" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M863.321996 251.674996 194.108395 251.674996 528.677333 621.186771Z" p-id="2162" fill="#333333"></path></svg>
 					</div>
 					<div class="psw_box">
-					
-					<input type="password"  id="password1" placeholder="密   码" value="" style="opacity:0;position: absolute;top:0;height:0px;z-index:-1" autoComplete="off"/>
 						<input type="text"  id="password" placeholder="密   码" value="" autoComplete="off"/>
 						<div class="rember" style="width:50%;float:left;text-align:left;margin-top:10px;display:inline-block;line-height:34px;">
 							<input type="checkbox" id="rem_flag"/>
@@ -128,9 +127,17 @@ body{
    			$("#loginname").focus();
    			
    		});
+   		$("#password").blur(function(){
+   			if($("#password").val()!=""){
+   				$("#password").attr("type","password");
+   			}else{
+   				$("#password").attr("type","text");
+   			}
+   		});
+   		$("#password").focus(function(){
+   			$("#password").attr("type","password");
+   		});
    		$("#loginname").focus(function(e){
-   			
-   		$("#password").attr("type","password");
    			var _html="";
    			var u_list=JSON.parse(storage.getItem('userNameList'));
    			console.log(u_list);
@@ -157,6 +164,7 @@ body{
    		
    		$(document).on('click','.history li',function(){
    			var p_list=JSON.parse(storage.getItem('passWordList'));
+   			$("#password").attr("type","password")
    			$("#loginname").val($(this).text());
    			$("#password").val(p_list[$(this).index()]);
    			$(".history").hide();
diff --git a/WebRoot/static/files/Template.xls b/WebRoot/static/files/Template.xls
index 24c926a..6adc64a 100644
--- a/WebRoot/static/files/Template.xls
+++ b/WebRoot/static/files/Template.xls
diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java
index 7315f09..2c7f5d9 100644
--- a/src/com/fh/controller/system/login/LoginController.java
+++ b/src/com/fh/controller/system/login/LoginController.java
@@ -584,15 +584,20 @@ public class LoginController extends BaseController {
 	 */
 	@RequestMapping(value = "/logout")
 	public ModelAndView logout() throws Exception {
-		String USERNAME = Jurisdiction.getUsername(); // 当前登录的用户名
-		logBefore(logger, USERNAME + "退出系统");
-		FHLOG.save(USERNAME, "退出");
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
-		this.removeSession(USERNAME);// 请缓存
-		// shiro销毁登录
-		Subject subject = SecurityUtils.getSubject();
-		subject.logout();
+		try{
+			String USERNAME = Jurisdiction.getUsername(); // 当前登录的用户名
+			logBefore(logger, USERNAME + "退出系统");
+			FHLOG.save(USERNAME, "退出");
+			
+			this.removeSession(USERNAME);// 请缓存
+			// shiro销毁登录
+			Subject subject = SecurityUtils.getSubject();
+			subject.logout();
+		}catch(NullPointerException e){
+			logBefore(logger, e.toString());
+		}
 		pd = this.getPageData();
 		pd.put("msg", pd.getString("msg"));
 		pd = this.setLoginPd(pd); // 设置登录页面的配置参数