权限代码修改

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

@@ -68,7 +68,7 @@ public class ConfigServiceImpl implements ConfigService {
     @Override
     public List<Day> findHolidaysByMonth(String date) {
 
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
         try {
             Date date1 = sdf.parse(date);
             int year = date1.getYear()+1900;
@@ -101,7 +101,7 @@ public class ConfigServiceImpl implements ConfigService {
                 return dayDao.saveAll(days1);
             }
             calendar.set(Calendar.MONTH,month-1);
-            calendar.set(Calendar.DAY_OF_MONTH,1);
+            calendar.set(Calendar.DAY_OF_MONTH,0);
             firstDate = calendar.getTime();
             calendar.set(Calendar.MONTH,month);
             calendar.set(Calendar.DAY_OF_MONTH,1);

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

@@ -128,7 +128,19 @@ public class UserServiceImpl implements IUserService {
     @Override
     public User findUserById(String id) {
         Optional<User> byId = pasUserDao.findById(id);
-        return byId.orElseGet(User::new);
+        List<String> roleIds = new ArrayList<>();
+        User user = null;
+        if(byId.isPresent()){
+            user = byId.get();
+            List<UserRole> userRoles = userRoleDao.findAllByUserId(user.getId());
+            for (UserRole userRole : userRoles) {
+                roleIds.add(userRole.getRoleId());
+            }
+            List<Role> roles = roleDao.findAllByIdIn(roleIds);
+            user.setRoles(roles);
+        }
+
+        return user;
     }
 
     @Override