|
@@ -26,6 +26,7 @@ import javax.validation.Valid;
|
|
import java.time.Duration;
|
|
import java.time.Duration;
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
|
+import java.time.LocalTime;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -67,7 +68,7 @@ public class SysDeptController {
|
|
SysDept sysDept = sysDeptService.getById(user.getDeptId());
|
|
SysDept sysDept = sysDeptService.getById(user.getDeptId());
|
|
|
|
|
|
LocalDate expiryDate = (sysDept != null && sysDept.getExpiryDate() != null) ? sysDept.getExpiryDate() : LocalDate.of(2099, 12, 31);
|
|
LocalDate expiryDate = (sysDept != null && sysDept.getExpiryDate() != null) ? sysDept.getExpiryDate() : LocalDate.of(2099, 12, 31);
|
|
- long remainDays = Duration.between(LocalDate.now(), expiryDate).toDays();
|
|
|
|
|
|
+ long remainDays = Duration.between(LocalDateTime.now(), LocalDateTime.of(expiryDate, LocalTime.MAX)).toDays();
|
|
|
|
|
|
Map<String, Object> res = new HashMap<>(3);
|
|
Map<String, Object> res = new HashMap<>(3);
|
|
|
|
|