Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2556

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceSelfHolidayFactory.java

@@ -147,12 +147,12 @@ public class AttendanceSelfHolidayFactory extends AbstractFactory {
 			index++;
 		}
 		if (null != wrapIn.getUnitNames() && wrapIn.getUnitNames().size()>0) {
-			sql_stringBuffer.append(" and o.unitName in ( ?" + (index) + ")");
+			sql_stringBuffer.append(" and o.unitOu in ( ?" + (index) + ")");
 			vs.add( wrapIn.getUnitNames() );
 			index++;
 		}
 		if (null != wrapIn.getTopUnitNames() && wrapIn.getTopUnitNames().size() > 0 ) {
-			sql_stringBuffer.append(" and o.topUnitName in ( ?" + (index) + ")");
+			sql_stringBuffer.append(" and o.topUnitOu in ( ?" + (index) + ")");
 			vs.add( wrapIn.getTopUnitNames() );
 			index++;
 		}

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionExportAbnormalDetail.java

@@ -7,6 +7,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
 import com.x.base.core.project.tools.ListTools;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -110,9 +111,21 @@ public class ActionExportAbnormalDetail extends BaseAction {
 			for (int i = 0; i < detailList.size(); i++) {
 				attendanceDetail = detailList.get(i);
 				row = sheet.createRow(i + 1);
-				row.createCell(0).setCellValue(attendanceDetail.getTopUnitName());
-				row.createCell(1).setCellValue(attendanceDetail.getUnitName());
-				row.createCell(2).setCellValue(attendanceDetail.getEmpName());
+				String topUnitName = attendanceDetail.getTopUnitName();
+				String unitName = attendanceDetail.getUnitName();
+				String empName = attendanceDetail.getEmpName();
+				if(StringUtils.isNotEmpty(topUnitName) && StringUtils.contains(topUnitName,"@")){
+					topUnitName = topUnitName.split("@")[0];
+				}
+				if(StringUtils.isNotEmpty(unitName) && StringUtils.contains(unitName,"@")){
+					unitName = unitName.split("@")[0];
+				}
+				if(StringUtils.isNotEmpty(empName) && StringUtils.contains(empName,"@")){
+					empName = empName.split("@")[0];
+				}
+				row.createCell(0).setCellValue(topUnitName);
+				row.createCell(1).setCellValue(unitName);
+				row.createCell(2).setCellValue(empName);
 				row.createCell(3).setCellValue(attendanceDetail.getRecordDateString());
 				if (attendanceDetail.getIsAbsent()) {
 					row.createCell(4).setCellValue("缺勤");

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/config/ActionSetProxy.java

@@ -35,13 +35,21 @@ class ActionSetProxy extends BaseAction {
 
 			}
 		}
+		
 		for (Application o : wi.getApplicationList()) {
-			Node node = Config.nodes().get(o.getNode());
+			 Node node = null;
+			if(o.getNode().equalsIgnoreCase("")) {
+				node = Config.nodes().get("127.0.0.1");	
+			}else {
+			    node = Config.nodes().get(o.getNode());
+			}
 			if (null != node) {
 				node.getApplication().setProxyHost(o.getProxyHost());
 				node.getApplication().setProxyPort(o.getProxyPort());
 			}
 		}
+		
+		
 		Config.nodes().save();
 		this.configFlush(effectivePerson);
 		Wo wo = new Wo();

o2server/x_program_center/src/main/webapp/jest/list.html

@@ -118,6 +118,7 @@
 				crossDomain : true,
 				error : function(e){
 					$('#contentTable').hide();
+					$('#content').html("<div align = 'center'>您没有权限查看，请以管理员身份登入！</div>");
 				}
 			}).done(function(json) {
 				if (json.type == 'success') {