From 5fc5876a94dcbd5e9a9fb91f5e3c01211e9c2d96 Mon Sep 17 00:00:00 2001 From: 懒羊羊 <15939171744@163.com> Date: 星期三, 24 一月 2024 16:59:19 +0800 Subject: [PATCH] 返修标记 --- jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java index 1bc21f6..b65b7ee 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java +++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java @@ -1,7 +1,10 @@ package com.jcdm.main.bs.orderScheduling.controller; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.jcdm.common.utils.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -50,8 +53,11 @@ @GetMapping("/list2") public TableDataInfo list2(BsOrderScheduling bsOrderScheduling) { -// startPage(); - List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling); +// startPage(); + List<BsOrderScheduling> list = new ArrayList<>(); + if (StringUtils.isNotEmpty(bsOrderScheduling.getOrderNo())){ + list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling); + } return getDataTable(list); } -- Gitblit v1.9.3