合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/ConfigServiceImpl.java

@@ -35,11 +35,19 @@ public class ConfigServiceImpl implements ConfigService {
 
     @Override
     public List<Date> findHolidays(HolidayRequest holidayRequest) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         List<Day> days = dayDao.findAllByStatusAndDateBetween("1",
                 holidayRequest.getStartDate(), holidayRequest.getEndDate());
         List<Date> dates = new ArrayList<>();
         for (Day day : days) {
-            dates.add(day.getDate());
+            String format = sdf.format(day);
+            try {
+                Date parse = sdf.parse(format);
+                dates.add(parse);
+            } catch (ParseException e) {
+
+            }
+
         }
         return dates;
     }
@@ -126,4 +134,5 @@ public class ConfigServiceImpl implements ConfigService {
         return true;
     }
 
+
 }

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/impl/UserManageServiceImpl.java

@@ -139,7 +139,7 @@ public class UserManageServiceImpl implements UserManageService {
             }
             Authority authority = authorityDao.findByIdInAndName(authorityIds, "查看人员");
             if(authority!=null){
-
+                String departmentId = role.getDepartmentId();
             }
 
         }