diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/LogoutFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/LogoutFilter.java
index 57206ed7..2600a9a8 100644
--- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/LogoutFilter.java
+++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/LogoutFilter.java
@@ -26,7 +26,7 @@ import com.jeesite.common.web.http.ServletUtils;
  */
 public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter {
 	
-	private static final Logger log = LoggerFactory.getLogger(LogoutFilter.class);
+	private static final Logger logger = LoggerFactory.getLogger(LogoutFilter.class);
 	private BaseAuthorizingRealm authorizingRealm; // 安全认证类
 	
 	@Override
@@ -53,7 +53,7 @@ public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter
 	    		// 退出登录	
 	    		subject.logout();
 	        } catch (SessionException ise) {
-	            log.debug("Encountered session exception during logout.  This can generally safely be ignored.", ise);
+	            logger.debug("Encountered session exception during logout.  This can generally safely be ignored.", ise);
 	        }
 	        
 	        // 如果是Ajax请求，返回Json字符串。
@@ -65,7 +65,7 @@ public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter
 	     	
 	        issueRedirect(request, response, redirectUrl);
 		}catch(Exception e){
-			log.debug("Encountered session exception during logout.  This can generally safely be ignored.", e);
+			logger.debug("Encountered session exception during logout.  This can generally safely be ignored.", e);
 		}
 		return false;
 	}
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java
index 0f6f5664..4b214949 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java
@@ -31,10 +31,10 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 		@Column(name="emp_no", 		attrName="empNo", 				label="员工工号"),
 		@Column(name="emp_name", 	attrName="empName", 			label="员工姓名", queryType=QueryType.LIKE),
 		@Column(name="emp_name_en", attrName="empNameEn", 			label="英文名", queryType=QueryType.LIKE),
-//		@Column(name="office_code", attrName="office.officeCode", 	label="机构编码", isQuery=false),
-//		@Column(name="office_name", attrName="office.officeName", 	label="机构名称", isQuery=false),
-//		@Column(name="company_code", attrName="company.companyCode", label="公司编码", isQuery=false),
-//		@Column(name="company_name", attrName="company.companyName", label="公司名称", isQuery=false),
+		@Column(name="office_code", attrName="office.officeCode", 	label="机构编码", isQuery=false),
+		@Column(name="office_name", attrName="office.officeName", 	label="机构名称", isQuery=false),
+		@Column(name="company_code", attrName="company.companyCode", label="公司编码", isQuery=false),
+		@Column(name="company_name", attrName="company.companyName", label="公司名称", isQuery=false),
 	}, joinTable={
 		@JoinTable(type=Type.LEFT_JOIN, entity=Office.class, alias="o", 
 			on="o.office_code = a.office_code",