[CODE]:协议查询

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/agreement/TWarehouseAgreementitemsController.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -44,6 +45,17 @@ public class TWarehouseAgreementitemsController extends BaseController {
      */
     @GetMapping("/warehousebills/list")
     public TableDataInfo list(TWarehouseAgreementitem tWarehouseAgreementitem) {
+        if(null!=tWarehouseAgreementitem.getfTaskType() &&  tWarehouseAgreementitem.getfTaskType() == 1 ){
+            if(tWarehouseAgreementitem.getfFleet()==null || tWarehouseAgreementitem.getfFleet().equals("") ){
+                List<Map<String, Object>> list = new ArrayList<>();
+                return getDataTable(list);
+            }
+        } else if(null!=tWarehouseAgreementitem.getfTaskType() &&  tWarehouseAgreementitem.getfTaskType() == 2) {
+            if(tWarehouseAgreementitem.getfLabour()==null || tWarehouseAgreementitem.getfLabour().equals("") ){
+                List<Map<String, Object>> list = new ArrayList<>();
+                return getDataTable(list);
+            }
+        }
         startPage();
         List<Map<String, Object>> list = tWarehouseAgreementitemsService.selectTWarehouseAgreementitemList(tWarehouseAgreementitem);
         return getDataTable(list);