格克

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/vacation/service/impl/VacationServiceImpl.java

@@ -70,8 +70,8 @@ public class VacationServiceImpl extends ServiceImpl<VacationMapper, Vacation> i
         String endDate=null;
         if (vacation.getDeptname()!=null&&!vacation.getDeptname().equals("1")){
             subDepIdsByDepId= makeUpCardMapper.getSubDepIdsByDepId(vacation.getDeptname());
-        }if (vacation.getHolidayType()!=null){
-            types=Arrays.asList(vacation.getHolidayType().split(","));
+        }if (vacation.getHolidayType()!=null&&!vacation.getHolidayType().equals("")){
+            types=Arrays.asList(vacation.getHolidayType().split(""));
         }if (vacation.getStartDate()!=null){
             startDate= DateUtils.formatDate(vacation.getStartDate());
         }if (vacation.getEndDate()!=null){