From 688896ea4e1605a15b56d890c9b8fa2808fa1265 Mon Sep 17 00:00:00 2001
From: gopi17701 <41270090+gopi17701@users.noreply.github.com>
Date: Tue, 24 Jul 2018 12:29:28 -0400
Subject: [PATCH] Add files via upload

---
 AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
index 14204cd..9f08960 100644
--- a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
+++ b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
@@ -41,13 +41,13 @@ public class SqlDAO extends DAO {
             List<PO> pos = new ArrayList<>();
             Statement stmt = conn.createStatement();
             String sql = "SELECT PO_num, contract_num, PO_date, customer_id, contract_amt FROM PO ";
-            if (PONum != null) {
+            if (PONum != null && !PONum.isEmpty()) {
                 sql += "WHERE UPPER(PO_num) = '" + PONum.toUpperCase() + "'";
-            } else if (contractNum != null) {
+            } else if (contractNum != null && !contractNum.isEmpty()) {
                 sql += "WHERE UPPER(contract_num) = '" + contractNum.toUpperCase()+ "'";
             } else if (PODate != null) {
                 sql += "WHERE PO_date = STR_TO_DATE(" + PODate + ", '%Y-%m-%d')";
-            } else if (astuteProjectNumber!= null) {
+            } else if (astuteProjectNumber!= null && !astuteProjectNumber.isEmpty() ) {
                 sql += "WHERE UPPER(astute_project_num) = '" + astuteProjectNumber.toUpperCase()+ "'";
             }
 
@@ -282,7 +282,7 @@ public class SqlDAO extends DAO {
             String whereClause = " WHERE ";
             boolean whereClauseIndicator = false;
             String sql = "SELECT inv_no, inv_date, PO_num, change_order_num, pmt_status, bill_amt, special_notes, certification FROM INVOICE ";
-            if (invoiceNumber != null) {
+            if (invoiceNumber != null && !invoiceNumber.isEmpty()) {
                 whereClause = whereClause + " UPPER(inv_no) = '"+ invoiceNumber.toUpperCase() +"'";
                 whereClauseIndicator = true;
             }