From 5af417d60d0cc3cd37afacead01c01ac2d7b6970 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 24 十月 2023 16:58:27 +0800
Subject: [PATCH] 10.24。1

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 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..e60548d 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
@@ -113,7 +113,7 @@
 //        }
 
         model.addAttribute("yysList",list1);
-        return PREFIX + "tShop_add.html";
+        return PREFIX + "TShop_add.html";
     }
     @RequestMapping("/tShop_add_one")
     public String tCompetitionAddOne(Integer id,Model model) {
@@ -122,7 +122,7 @@
         String roleid = UserExt.getUser().getRoleid();
         model.addAttribute("id",id);
 
-        return PREFIX + "tShop_add_one.html";
+        return PREFIX + "TShop_add_one.html";
     }
     @RequestMapping("/tShop_add_two")
     public String tCompetitionAddTwo(Integer id,Model model) {
@@ -187,13 +187,13 @@
         User byId1 = userMapper.selectById(byId.getStoreStaffId());
         model.addAttribute("city",byId1);
         model.addAttribute("type",1);
-        return PREFIX + "tShop_edit.html";
+        return PREFIX + "TShop_edit.html";
     }
     @RequestMapping("/tShop_update1/{id}")
     public String tCityUpdate1(@PathVariable Integer id, Model model) {
         TStoreOther byId = storeOtherService.getById(id);
         model.addAttribute("item",byId);
-        return PREFIX + "tShop_edit_one.html";
+        return PREFIX + "TShop_edit_one.html";
     }
 
 
@@ -204,14 +204,16 @@
         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";
+        return PREFIX + "TShop_edit_two.html";
     }
     @RequestMapping("/tShop_update_one1/{id}")
     public String tCityUpdateOne1(@PathVariable Integer id, Model model) {
@@ -225,7 +227,7 @@
         model.addAttribute("list",list);
         model.addAttribute("list1",list1);
 
-        return PREFIX + "tShop_add_three.html";
+        return PREFIX + "TShop_add_three.html";
     }
 
 
@@ -252,14 +254,14 @@
         User byId1 = userMapper.selectById(byId.getStoreStaffId());
         model.addAttribute("city",byId1);
         model.addAttribute("type",0);
-        return PREFIX + "tShop_edit.html";
+        return PREFIX + "TShop_edit.html";
     }
     @RequestMapping("/tShop_gift/{id}")
     public String tCityGift(@PathVariable Integer id, Model model) {
         TStore byId = storeService.getById(id);
         model.addAttribute("welfarePicture",byId.getWelfarePicture());
         model.addAttribute("id",id);
-        return PREFIX + "tShop_img.html";
+        return PREFIX + "TShop_img.html";
     }
     @RequestMapping("/tShop_indexSet/{id}")
     public String tCityIndexSet(@PathVariable Integer id, Model model) {
@@ -280,7 +282,7 @@
         StoreConfig c8 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,8));
         model.addAttribute("c8",c8);
         model.addAttribute("id",id);
-        return PREFIX + "tShop_imgAll.html";
+        return PREFIX + "TShop_imgAll.html";
     }
 
 
@@ -691,10 +693,8 @@
     @RequestMapping(value = "/deleteTwo")
     public Object delete2(Integer id) {
         try {
-            TStoreOtherConfigTrue byId = tStoreOtherConfigTrueService.getById(id);
+            storeOtherConfigService.removeById(id);
 
-            byId.setState(2);
-            tStoreOtherConfigTrueService.updateById(byId);
             return SUCCESS_TIP;
         }catch (Exception e){
             e.printStackTrace();

--
Gitblit v1.7.1