考勤，添加周末配置初始化

ba94361e · luojing · b37f2ffa · ba94361e
隐藏空白更改
内联并排

Showing with 3 addition and 2 deletion

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceSettingServiceAdv.java ...assemble/control/service/AttendanceSettingServiceAdv.java +3 -2

未找到文件。
--- a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceSettingServiceAdv.java
+++ b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceSettingServiceAdv.java
@@ -129,8 +129,9 @@ public class AttendanceSettingServiceAdv {
 				if( (configValue.indexOf("周六")>-1 && cal.get(Calendar.DAY_OF_WEEK)==Calendar.SATURDAY) || (configValue.indexOf("周日")>-1 && cal.get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY)){
 					iflag = true;
 				}
-			}else{
-				iflag = true;
+				if(configValue.indexOf("无")>-1 && (cal.get(Calendar.DAY_OF_WEEK)==Calendar.SATURDAY || cal.get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY) ){
+					iflag = true;
+				}
 			}

 		}