|
@@ -285,6 +285,12 @@ public class WorkCalendarDateHandler {
|
|
|
}
|
|
|
|
|
|
boolean isCustom = false;
|
|
|
+ String dictCode = ruleDate.getDictCode();
|
|
|
+ if ("OpenTime".equals(ruleDate.getDictType())) {
|
|
|
+
|
|
|
+
|
|
|
+ ruleDate.setDictCode(null);
|
|
|
+ }
|
|
|
for (WorkCalendarDate customDate : customDates) {
|
|
|
|
|
|
if (dictTypeLevel == 0) {
|
|
@@ -305,6 +311,8 @@ public class WorkCalendarDateHandler {
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ ruleDate.setDictCode(dictCode);
|
|
|
|
|
|
if (!isCustom) {
|
|
|
result.add(ruleDate);
|