diff --git a/src/app/api/division/route.ts b/src/app/api/division/route.ts
index f7be952..5a7e8c4 100644
--- a/src/app/api/division/route.ts
+++ b/src/app/api/division/route.ts
@@ -77,6 +77,9 @@ export async function GET(request: Request) {
                   idUser: true
                }
             }
+         },
+         orderBy: {
+            createdAt: 'desc'
          }
       });
 
diff --git a/src/module/division_new/ui/create_report.tsx b/src/module/division_new/ui/create_report.tsx
index 2dccbc4..766a0ef 100644
--- a/src/module/division_new/ui/create_report.tsx
+++ b/src/module/division_new/ui/create_report.tsx
@@ -66,13 +66,23 @@ export default function CreateReport() {
       onReport(val, value)
     }
 
+    if (val == null || val == "") {
+      setTampil(false)
+      toast.error("Error! harus memilih grup")
+    }
     setIsGroup(String(val))
   }
 
   function onChangeDate(val: any) {
-    if (val != null && val != "" && isGroup != "" && isGroup != null) {
+    if (val != null && val != "" && isGroup != "" && isGroup != "null") {
       onReport(isGroup, val)
     }
+
+    if (isGroup == null || isGroup == "") {
+      setTampil(false)
+      toast.error("Error! harus memilih grup")
+    }
+
     setValue(val)
   }