From 1f1b5541a872a0b2d974344df18e0890f414cc9b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 三月 2024 17:43:59 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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 0e5b648..d80850d 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
@@ -422,7 +422,11 @@
model.addAttribute("c8",c8);
model.addAttribute("id",id);
StoreConfig c9 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,9));
- model.addAttribute("c9",c9);
+ if (c9==null){
+ model.addAttribute("c9",new StoreConfig());
+ }else{
+ model.addAttribute("c9",c9);
+ }
return PREFIX + "TShop_imgAll.html";
}
@@ -744,12 +748,27 @@
}
private StoreConfig collect(Integer id,Integer sort,Integer isOpen,String img,int type){
- StoreConfig one = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType, type));
- one.setSort(sort);
- one.setIsOpen(isOpen);
- if(ToolUtil.isNotEmpty(img)){
- one.setBackgroundImage(img);
+ StoreConfig one = storeConfigService.getOne(new QueryWrapper<StoreConfig>()
+ .eq("storeId", id)
+ .eq("type", type));
+ if (one!=null){
+ one.setSort(sort);
+ one.setIsOpen(isOpen);
+ if(ToolUtil.isNotEmpty(img)){
+ one.setBackgroundImage(img);
+ }
}
+ if (one == null){
+ StoreConfig storeConfig = new StoreConfig();
+ storeConfig.setStoreId(id);
+ storeConfig.setType(type);
+ storeConfig.setIsOpen(isOpen);
+ storeConfig.setSort(sort);
+ storeConfig.setBackgroundImage(img);
+ storeConfigService.save(storeConfig);
+ return storeConfig;
+ }
+
return one;
}
@RequestMapping(value = "/oneChangeNext")
--
Gitblit v1.7.1