From 759f6882640c4f9e5521380fe819d2a61103cfe4 Mon Sep 17 00:00:00 2001
From: "usama.jameel" <usama.jameel@utopia.pk>
Date: Mon, 6 Jan 2025 11:15:23 +0500
Subject: [PATCH] fixed redirect

---
 .../com/utopiaindustries/controller/CuttingController.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/utopiaindustries/controller/CuttingController.java b/src/main/java/com/utopiaindustries/controller/CuttingController.java
index bddf877..d608c7e 100644
--- a/src/main/java/com/utopiaindustries/controller/CuttingController.java
+++ b/src/main/java/com/utopiaindustries/controller/CuttingController.java
@@ -61,12 +61,11 @@ public class CuttingController {
                                          @RequestParam( value = "site-id", required = false ) String siteId,
                                          @RequestParam( value = "count", required = false ) Long count,
                                          Model model ){
-
-        model.addAttribute("accounts", inventoryAccountService.getInventoryAccounts( id, title, active, createdBy, startDate, endDate, siteId, count , "PROCESS", "1", false) );
-        model.addAttribute("locations", locationService.findAll() );
         if(StringUtils.isNullOrEmpty( active )){
             return "redirect:/cutting/inventory-accounts?id=&title=&active=1&created-by=&start-date=&end-date=&site-id=&site-title=&count=100";
         }
+        model.addAttribute("accounts", inventoryAccountService.getInventoryAccounts( id, title, active, createdBy, startDate, endDate, siteId, count , "PROCESS", "1", false) );
+        model.addAttribute("locations", locationService.findAll() );
         return "/cutting/inventory-accounts";
     }