From f698f94c6a1e64b8cc4616cdd44d0405c0893f04 Mon Sep 17 00:00:00 2001 From: donqi Date: Mon, 6 Jun 2022 10:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/web/controller/customer/CustomerBankController.java | 2 +- .../com/ghy/web/controller/order/OrderMasterController.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerBankController.java b/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerBankController.java index 7303988d..a1248f7a 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerBankController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerBankController.java @@ -28,7 +28,7 @@ import java.util.Set; */ @Slf4j @Controller -@RequestMapping("customer/bankcard") +@RequestMapping("/customer/bankcard") public class CustomerBankController { @Resource diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index f1696298..abe5dbc7 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -28,6 +28,7 @@ import com.ghy.worker.service.WorkerService; import com.github.pagehelper.PageInfo; import lombok.RequiredArgsConstructor; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.util.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -88,7 +89,7 @@ public class OrderMasterController extends BaseController { OrderGoods orderGoods = orderGoodsService.selectByOrderMasterId(master.getId()); // 添加商品信息 - if(goodsStandardService.selectByGoodsId(orderGoods.getGoodsId())!=null){ + if(!CollectionUtils.isEmpty(goodsStandardService.selectByGoodsId(orderGoods.getGoodsId()))){ orderGoods.setGoodsStandard(goodsStandardService.selectByGoodsId(orderGoods.getGoodsId()).get(0)); }