From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/BannerService.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/BannerService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/BannerService.java
index 67356e4..3b1c587 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/BannerService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/BannerService.java
@@ -9,7 +9,9 @@
 import com.sandu.ximon.admin.dto.BannerDto;
 import com.sandu.ximon.admin.param.BannerParam;
 import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.dao.domain.Admin;
 import com.sandu.ximon.dao.domain.Banner;
+import com.sandu.ximon.dao.domain.Client;
 import com.sandu.ximon.dao.mapper.BannerMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
@@ -34,11 +36,14 @@
     /**
      * 娣诲姞banner
      */
-    public boolean addBanner(BannerParam bannerParam) {
+    public boolean addBanner(BannerParam bannerParam, Client client) {
         Banner banner = new Banner();
         banner.setId(snowflake.nextId());
         banner.setBannerUrl(ResUtils.removePrefix(bannerParam.getUrl()));
         banner.setBindingAuthor(bannerParam.getBinding_author());
+        if (client != null && client.getSuperiorId() != null) {
+            banner.setClientId(client.getSuperiorId());
+        }
         return save(banner);
     }
 
@@ -81,8 +86,11 @@
      * @return
      */
     public List<Banner> listBanner() {
+        LambdaQueryWrapper<Banner> wrapper = Wrappers.lambdaQuery(Banner.class).eq(Banner::getBindingAuthor, SecurityUtils.getUserId())
+                .or(wrapper1 -> {
+                    wrapper1.eq(Banner::getClientId, SecurityUtils.getUserId());
+                });
 
-        LambdaQueryWrapper<Banner> wrapper = Wrappers.lambdaQuery(Banner.class).eq(Banner::getBindingAuthor, SecurityUtils.getUserId());
         List<Banner> list = list(wrapper);
         for (Banner banner : list) {
             banner.setBannerUrl(ResUtils.addPrefix(banner.getBannerUrl()));

--
Gitblit v1.9.3