diff --git a/WebRoot/WEB-INF/jsp/feedback/feedback/feedback_list.jsp b/WebRoot/WEB-INF/jsp/feedback/feedback/feedback_list.jsp
index b553703..bd4edf8 100644
--- a/WebRoot/WEB-INF/jsp/feedback/feedback/feedback_list.jsp
+++ b/WebRoot/WEB-INF/jsp/feedback/feedback/feedback_list.jsp
@@ -33,27 +33,8 @@
 						<form action="feedback/list.do" method="post" name="Form" id="Form">
 						<table style="margin-top:5px;">
 							<tr>
-								<td>
-									<div class="nav-search">
-										<span class="input-icon">
-											<input type="text" placeholder="这里输入关键词" class="nav-search-input" id="nav-search-input" autocomplete="off" name="keywords" value="${pd.keywords }" placeholder="这里输入关键词"/>
-											<i class="ace-icon fa fa-search nav-search-icon"></i>
-										</span>
-									</div>
-								</td>
-								<td style="padding-left:2px;"><input class="span10 date-picker" name="lastStart" id="lastStart"  value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="开始日期" title="开始日期"/></td>
-								<td style="padding-left:2px;"><input class="span10 date-picker" name="lastEnd" name="lastEnd"  value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="结束日期" title="结束日期"/></td>
-								<td style="vertical-align:top;padding-left:2px;">
-								 	<select class="chosen-select form-control" name="name" id="id" data-placeholder="请选择" style="vertical-align:top;width: 120px;">
-									<option value=""></option>
-									<option value="">全部</option>
-									<option value="">1</option>
-									<option value="">2</option>
-								  	</select>
-								</td>
-								<c:if test="${QX.cha == 1 }">
-								<td style="vertical-align:top;padding-left:2px"><a class="btn btn-light btn-xs" onclick="tosearch();"  title="检索"><i id="nav-search-icon" class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a></td>
-								</c:if>
+								
+
 								<c:if test="${QX.toExcel == 1 }"><td style="vertical-align:top;padding-left:2px;"><a class="btn btn-light btn-xs" onclick="toExcel();" title="导出到EXCEL"><i id="nav-search-icon" class="ace-icon fa fa-download bigger-110 nav-search-icon blue"></i></a></td></c:if>
 							</tr>
 						</table>
@@ -110,7 +91,8 @@
 											<td class='center'>${var.SOFTWARE_NAME}</td>
 											<td class='center'>${var.EXCEPTION_NUM}</td>
 											<td class='center'>${var.DESCRIPTION}</td>
-											<td class='center'>${var.PROBLEM_PATH}</td>
+											<%-- <td class='center'>${var.PROBLEM_PATH}</td> --%>
+											<td><img src="../../../../SunvoteEducation/images/${var.PROBLEM_PATH}" class="img-responsive" alt="Responsive image"></td>
 											<td class='center'>${var.CUSTOMER_CODE}</td>
 											<td class='center'>${var.PERSON_LIABLE}</td>
 											<td class='center'>${var.CREATE_DATE}</td>
diff --git a/WebRoot/WEB-INF/jsp/feedback/problemphenomenon/problemphenomenon_list.jsp b/WebRoot/WEB-INF/jsp/feedback/problemphenomenon/problemphenomenon_list.jsp
index 406d315..b7fc169 100644
--- a/WebRoot/WEB-INF/jsp/feedback/problemphenomenon/problemphenomenon_list.jsp
+++ b/WebRoot/WEB-INF/jsp/feedback/problemphenomenon/problemphenomenon_list.jsp
@@ -31,32 +31,7 @@
 							
 						<!-- 检索  -->
 						<form action="problemphenomenon/list.do" method="post" name="Form" id="Form">
-						<table style="margin-top:5px;">
-							<tr>
-								<td>
-									<div class="nav-search">
-										<span class="input-icon">
-											<input type="text" placeholder="这里输入关键词" class="nav-search-input" id="nav-search-input" autocomplete="off" name="keywords" value="${pd.keywords }" placeholder="这里输入关键词"/>
-											<i class="ace-icon fa fa-search nav-search-icon"></i>
-										</span>
-									</div>
-								</td>
-								<td style="padding-left:2px;"><input class="span10 date-picker" name="lastStart" id="lastStart"  value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="开始日期" title="开始日期"/></td>
-								<td style="padding-left:2px;"><input class="span10 date-picker" name="lastEnd" name="lastEnd"  value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="结束日期" title="结束日期"/></td>
-								<td style="vertical-align:top;padding-left:2px;">
-								 	<select class="chosen-select form-control" name="name" id="id" data-placeholder="请选择" style="vertical-align:top;width: 120px;">
-									<option value=""></option>
-									<option value="">全部</option>
-									<option value="">1</option>
-									<option value="">2</option>
-								  	</select>
-								</td>
-								<c:if test="${QX.cha == 1 }">
-								<td style="vertical-align:top;padding-left:2px"><a class="btn btn-light btn-xs" onclick="tosearch();"  title="检索"><i id="nav-search-icon" class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a></td>
-								</c:if>
-								<c:if test="${QX.toExcel == 1 }"><td style="vertical-align:top;padding-left:2px;"><a class="btn btn-light btn-xs" onclick="toExcel();" title="导出到EXCEL"><i id="nav-search-icon" class="ace-icon fa fa-download bigger-110 nav-search-icon blue"></i></a></td></c:if>
-							</tr>
-						</table>
+						
 						<!-- 检索  -->
 					
 						<table id="simple-table" class="table table-striped table-bordered table-hover" style="margin-top:5px;">	
diff --git a/WebRoot/WEB-INF/jsp/system/index/left.jsp b/WebRoot/WEB-INF/jsp/system/index/left.jsp
index fced8f3..15f5df4 100644
--- a/WebRoot/WEB-INF/jsp/system/index/left.jsp
+++ b/WebRoot/WEB-INF/jsp/system/index/left.jsp
@@ -3,7 +3,7 @@
 					try{ace.settings.check('sidebar' , 'fixed')}catch(e){}
 				</script>
 
-				<div class="sidebar-shortcuts" id="sidebar-shortcuts">
+				<div style="display:none" class="sidebar-shortcuts" id="sidebar-shortcuts">
 					<div class="sidebar-shortcuts-large" id="sidebar-shortcuts-large">
 						
 						<button class="btn btn-info" onclick="changeMenus('index');" title="业务菜单">
diff --git a/WebRoot/WEB-INF/jsp/system/index/login.jsp b/WebRoot/WEB-INF/jsp/system/index/login.jsp
index 0e10a44..cadb346 100644
--- a/WebRoot/WEB-INF/jsp/system/index/login.jsp
+++ b/WebRoot/WEB-INF/jsp/system/index/login.jsp
@@ -249,7 +249,7 @@
 			if(check()){
 				var loginname = $("#loginname").val();
 				var password = $("#password").val();
-				var code = "elvis"+loginname+",fh,"+password+"elvis"+",fh,"+$("#code").val();
+				var code = loginname+";;;"+password+";;;" + $("#code").val();
 				$.ajax({
 					type: "POST",
 					url: 'login_login',
diff --git a/WebRoot/WEB-INF/jsp/system/role/role_list.jsp b/WebRoot/WEB-INF/jsp/system/role/role_list.jsp
index 002458f..2b2e06f 100644
--- a/WebRoot/WEB-INF/jsp/system/role/role_list.jsp
+++ b/WebRoot/WEB-INF/jsp/system/role/role_list.jsp
@@ -53,7 +53,7 @@
 							
 							<table>
 								<tr height="7px;"><td colspan="100"></td></tr>
-								<tr>
+								<tr style="display:none">
 								<td><font color="#808080">本组：</font></td>
 								<td>
 								<c:if test="${QX.edit == 1 }">
@@ -64,10 +64,10 @@
 										</c:when>
 										<c:otherwise>
 										<c:if test="${QX.edit == 1 }">
-										<a class="btn btn-mini btn-purple" onclick="editRights('${pd.ROLE_ID }');">
+										<a  class="btn btn-mini btn-purple" onclick="editRights('${pd.ROLE_ID }');">
 											<i class="icon-pencil"></i>
-											<c:if test="${pd.ROLE_ID == '1'}">Admin 菜单权限</c:if>
-											<c:if test="${pd.ROLE_ID != '1'}">组菜单权限</c:if>
+											<c:if test="${pd.ROLE_ID == '12121221'}">Admin 菜单权限</c:if>
+											<c:if test="${pd.ROLE_ID == '112121221'}">组菜单权限</c:if>
 										</a>
 										</c:if>
 										</c:otherwise>
diff --git a/src/com/fh/controller/api/ApiServer.java b/src/com/fh/controller/api/ApiServer.java
index 656f2f3..248fec4 100644
--- a/src/com/fh/controller/api/ApiServer.java
+++ b/src/com/fh/controller/api/ApiServer.java
@@ -294,13 +294,13 @@ public class ApiServer extends BaseController {
 					if (content[0].contains("image")) {
 						fileType = content[0].substring(11,content[0].length());
 					}
-					File dir = new File(path + File.separator +  "fb_"
-							+ System.currentTimeMillis() + "." + fileType);
+					String filename = "fb_"	+ System.currentTimeMillis() + "." + fileType ;
+					File dir = new File(path + File.separator + filename );
 					if (!dir.exists()) {
 						dir.createNewFile();
 					}
 					generateImage(content[1], dir.getAbsolutePath());
-					pd.put("PROBLEM_PATH", dir.getAbsolutePath());
+					pd.put("PROBLEM_PATH", filename);
 				}
 			}
 		}
diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java
index 3af8797..72e8999 100644
--- a/src/com/fh/controller/system/login/LoginController.java
+++ b/src/com/fh/controller/system/login/LoginController.java
@@ -96,7 +96,7 @@ public class LoginController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		String errInfo = "";
-		String KEYDATA[] = pd.getString("KEYDATA").replaceAll("elvis", "").split(",fh,");
+		String KEYDATA[] = pd.getString("KEYDATA").split(";;;");
 		if(null != KEYDATA && KEYDATA.length >= 2){
 			Session session = Jurisdiction.getSession();
 			String sessionCode = (String)session.getAttribute(Const.SESSION_SECURITY_CODE);		//获取session中的验证码
diff --git a/src/com/fh/util/Const.java b/src/com/fh/util/Const.java
index 599b81b..ea3c7f7 100644
--- a/src/com/fh/util/Const.java
+++ b/src/com/fh/util/Const.java
@@ -32,7 +32,7 @@ public class Const {
 	public static final String FILEPATHFILE = "uploadFiles/file/";			//文件上传路径
 	public static final String FILEPATHFILEOA = "uploadFiles/uploadFile/";	//文件上传路径(oa管理)
 	public static final String FILEPATHTWODIMENSIONCODE = "uploadFiles/twoDimensionCode/"; //二维码存放路径
-	public static final String NO_INTERCEPTOR_PATH = ".*/((login)|(logout)|(code)|(app)|(weixin)|(static)|(afterService)|(main)|(api)|(websocket)|(uploadImgs)).*";	//不对匹配该值的访问路径拦截（正则）
+	public static final String NO_INTERCEPTOR_PATH = ".*/((login)|(logout)|(code)|(app)|(weixin)|(static)|(images)|(afterService)|(main)|(api)|(websocket)|(uploadImgs)).*";	//不对匹配该值的访问路径拦截（正则）
 	public static ApplicationContext WEB_APP_CONTEXT = null; //该值会在web容器启动时由WebAppContextListener初始化
 	
 	/**