commit

src/main/java/com/example/afrishop_v3/controllers/TbCfHomePageEntityController.java

@@ -81,7 +81,7 @@ public class TbCfHomePageEntityController extends Controller {
 
     @GetMapping("/home/clientWithFcm")
     public Result getClientList( @RequestParam(value = "pageNo",required = false,defaultValue = "20") Integer pageNo, @RequestParam(value = "pageSize",required = false,defaultValue = "20") Integer pageSize){
-        List<TbCfUserInfo> allByFcmIsNotNull = userRepository.findAllByFcmIsNotNull(PageRequest.of(pageNo, pageSize));
+        List<TbCfUserInfo> allByFcmIsNotNull = userRepository.findAllByFcmIsNotNullOrderByLastLoginTimeDesc(PageRequest.of(pageNo, pageSize));
         return new Result<>(allByFcmIsNotNull.stream().map(TbCfUserInfo::smallMap).collect(Collectors.toList()));
     }
 

src/main/java/com/example/afrishop_v3/models/TbCfUserInfo.java

@@ -235,6 +235,7 @@ public class TbCfUserInfo {
         map.put("phone",getPhone());
         map.put("email",getEmail());
         map.put("bio",getSlogan());
+        map.put("lastLoginTime",getLastLoginTime());
         return map;
     }
 

src/main/java/com/example/afrishop_v3/repository/UserRepository.java

@@ -15,5 +15,5 @@ public interface UserRepository extends PagingAndSortingRepository<TbCfUserInfo,
     Optional<TbCfUserInfo> findFirstByEmail(String s);
     Optional<TbCfUserInfo> findByCode(String s);
     boolean existsByCode(String code);
-    List<TbCfUserInfo> findAllByFcmIsNotNull(Pageable pageable);
+    List<TbCfUserInfo> findAllByFcmIsNotNullOrderByLastLoginTimeDesc(Pageable pageable);
 }