优化

src/main/java/com/persagy/calendar/handle/WorkCalendarLabelHandler.java

@@ -168,7 +168,7 @@ public class WorkCalendarLabelHandler {
 			WorkCalendarLabel calendarLabel = dictCode2Label.get(dictCode);
 			
 			if (labelDates.size() == 1) {
-				this.convert2Response(calendarLabel, null, null);
+				resultList.add(this.convert2Response(calendarLabel, null, null));
 				continue;
 			}
 			// 先排序
@@ -199,7 +199,7 @@ public class WorkCalendarLabelHandler {
 				
 				// 最后一天无论与之前的相不相等，都应该封装响应结果
 				if (i == (size - 1)) {
-					resultList.add(convert2Response(calendarLabel, minDate, labelDate));
+					resultList.add(this.convert2Response(calendarLabel, minDate, labelDate));
 				}
 			}
 		}
@@ -363,8 +363,8 @@ public class WorkCalendarLabelHandler {
 		WorkCalendarLabel result = new WorkCalendarLabel();
 		BeanUtils.copyProperties(temp, result);
 		result.setLabelDate(null);
-		result.setLabelDateStart(labelDateStart == null ? temp.getLabelDateStart() : labelDateStart);
-		result.setLabelDateEnd(labelDateEnd == null ? temp.getLabelDateEnd() : labelDateEnd);
+		result.setLabelDateStart(labelDateStart == null ? temp.getLabelDate() : labelDateStart);
+		result.setLabelDateEnd(labelDateEnd == null ? temp.getLabelDate() : labelDateEnd);
 		return result;
 	}