From 98554a353856fc4bbc1e4af9ae12ea6d78f1bb99 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 19 十月 2023 15:33:11 +0800
Subject: [PATCH] 10.18.2

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index 06a2baa..76d7ea4 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -204,11 +204,13 @@
         TStoreOtherConfig byId = storeOtherConfigService.getById(id);
         TTurn one = tTurnService.getOne(new LambdaQueryWrapper<TTurn>().eq(TTurn::getName, byId.getName()));
         // page list
-        List<TTurn> list = tTurnService.list(new LambdaQueryWrapper<TTurn>().eq(TTurn::getPid, one.getId()));
+        if (one!=null) {
+            List<TTurn> list = tTurnService.list(new LambdaQueryWrapper<TTurn>().eq(TTurn::getPid, one.getId()));
+            model.addAttribute("list", list);
+        }
         // type list
         List<TTurn> list1 = tTurnService.list(new LambdaQueryWrapper<TTurn>().eq(TTurn::getPid, byId.getPageId()));
         model.addAttribute("item",byId);
-        model.addAttribute("list",list);
         model.addAttribute("list1",list1);
 
         return PREFIX + "tShop_edit_two.html";

--
Gitblit v1.7.1