Merge branch 'master' of http://121.42.53.174:3000/bulomakaka/ekexiu.com.portal.git

src/main/resources/log4j.properties

@@ -9,7 +9,7 @@ log4j.appender.stdout.layout.ConversionPattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss,S
### \u8F93\u51FADEBUG \u7EA7\u522B\u4EE5\u4E0A\u7684\u65E5\u5FD7\u5230=E://logs/log.log ###
log4j.appender.D = org.apache.log4j.DailyRollingFileAppender
log4j.appender.D.File = /home/tomcat/apache-tomcat-7.0.73/webapps/log.log
log4j.appender.D.File = /home/tomcat/apache-tomcat-7.0.73/webapps/logs/log.log
log4j.appender.D.Append = true
log4j.appender.D.Threshold = DEBUG 
log4j.appender.D.layout = org.apache.log4j.PatternLayout
@@ -17,7 +17,7 @@ log4j.appender.D.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r ]
### \u8F93\u51FAERROR \u7EA7\u522B\u4EE5\u4E0A\u7684\u65E5\u5FD7\u5230=E://logs/error.log ###
log4j.appender.E = org.apache.log4j.DailyRollingFileAppender
log4j.appender.E.File =/home/tomcat/apache-tomcat-7.0.73/webapps/error.log 
log4j.appender.E.File =/home/tomcat/apache-tomcat-7.0.73/webapps/logs/error.log 
log4j.appender.E.Append = true
log4j.appender.E.Threshold = ERROR 
log4j.appender.E.layout = org.apache.log4j.PatternLayout

src/main/webapp/js/workindex.js

@@ -30,13 +30,23 @@ $(function(){
					}
				}
			if(data.data.office) {
				$("#office").text(data.data.office+",");
				if(data.data.title) {
					$("#office").text(data.data.office+"，");
				}else{
					$("#office").text(data.data.office);
				}
				
			}
			if(data.data.title) {
				$("#title").text(data.data.title+",");
				$("#title").text(data.data.title);
			}			
			if(data.data.department) {
				$("#department").text(data.data.department+",");
				if(data.data.orgName) {
					$("#department").text(data.data.department+"，");
				}else{
					$("#department").text(data.data.department);
				}
				
			}
			if(data.data.orgName) {
				$("#organization").text(data.data.orgName);