From e0ec0a20cb943b4ee92c45b64f02b007a003b0ba Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 01 三月 2024 18:22:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java index 10dde53..99c1429 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java @@ -189,6 +189,12 @@ @ResponseBody @RequestMapping(value = "/addAdvertisement") public ResultUtil addAdvertisement(@RequestBody Banner banner) { + if (banner.getType().equals("请选择")){ + banner.setType(null); + } + if (banner.getPage().equals("请选择")){ + banner.setPage(null); + } banner.setInsertTime(new Date()); bannerClient.addAdvertisement(banner); return ResultUtil.success("添加成功"); @@ -204,6 +210,15 @@ if (banner.getImg().equals("")||banner==null){ banner.setImg(byId.getImg()); } + + if (banner.getType().equals("请选择")){ + banner.setType(null); + } + if (banner.getPage().equals("请选择")){ + banner.setPage(null); + } + + bannerClient.updateAdvertisement(banner); return ResultUtil.success("添加成功"); } -- Gitblit v1.7.1