From d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 22:11:24 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/BannerController.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/BannerController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/BannerController.java
index 1881471..7993b37 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/BannerController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/BannerController.java
@@ -1,5 +1,6 @@
 package com.panzhihua.sangeshenbian.api;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.panzhihua.common.controller.BaseController;
 import com.panzhihua.common.interfaces.OperLog;
@@ -54,7 +55,7 @@
 		Integer id = this.getLoginUserInfoSanGeShenBian().getId();
 		SystemUser systemUser = systemUserService.getById(id);
 		if(systemUser.getAccountLevel() != 1){
-			return R.fail("添加失败");
+			return R.fail("添加失败,权限不足。");
 		}
 		banner.setDel(0);
 		banner.setCreateTime(LocalDateTime.now());
@@ -70,7 +71,7 @@
 		Integer id = this.getLoginUserInfoSanGeShenBian().getId();
 		SystemUser systemUser = systemUserService.getById(id);
 		if(systemUser.getAccountLevel() != 1){
-			return R.fail("编辑失败");
+			return R.fail("编辑失败,权限不足。");
 		}
 		bannerService.updateById(banner);
 		return R.ok(banner);
@@ -84,12 +85,9 @@
 		Integer id1 = this.getLoginUserInfoSanGeShenBian().getId();
 		SystemUser systemUser = systemUserService.getById(id1);
 		if(systemUser.getAccountLevel() != 1){
-			return R.fail("删除失败");
+			return R.fail("删除失败,权限不足。");
 		}
-		Banner banner = new Banner();
-		banner.setId(id);
-		banner.setDel(1);
-		bannerService.updateById(banner);
+		bannerService.update(new UpdateWrapper<Banner>().eq("id", id).set("del", 1));
 		return R.ok();
 	}
 	

--
Gitblit v1.7.1