From bfce748e37a753c729e15dd233600379f504d019 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 13:59:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/BannerService.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 ad8ad39..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
@@ -1,18 +1,17 @@
package com.sandu.ximon.admin.service;
-import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.lang.Snowflake;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.ResUtils;
import com.sandu.ximon.admin.dto.BannerDto;
-import com.sandu.ximon.admin.dto.BannerPositionDto;
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;
@@ -37,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.setAuthor(SecurityUtils.getUsername());
+ banner.setBindingAuthor(bannerParam.getBinding_author());
+ if (client != null && client.getSuperiorId() != null) {
+ banner.setClientId(client.getSuperiorId());
+ }
return save(banner);
}
@@ -58,7 +60,7 @@
throw new BusinessException("鎵句笉鍒癰anner");
}
Banner update = new Banner();
- // BeanUtils.copyProperties(bannerParam, update);
+ // BeanUtils.copyProperties(bannerParam, update);
update.setId(bannerId);
update.setBannerUrl(bannerParam.getUrl());
return updateById(update);
@@ -66,6 +68,7 @@
/**
* 鍒犻櫎banner
+ *
* @param bannerId
* @return
*/
@@ -79,10 +82,15 @@
/**
* 鏌ヨbanner
+ *
* @return
*/
public List<Banner> listBanner() {
- LambdaQueryWrapper<Banner> wrapper = Wrappers.lambdaQuery(Banner.class);
+ LambdaQueryWrapper<Banner> wrapper = Wrappers.lambdaQuery(Banner.class).eq(Banner::getBindingAuthor, SecurityUtils.getUserId())
+ .or(wrapper1 -> {
+ wrapper1.eq(Banner::getClientId, SecurityUtils.getUserId());
+ });
+
List<Banner> list = list(wrapper);
for (Banner banner : list) {
banner.setBannerUrl(ResUtils.addPrefix(banner.getBannerUrl()));
--
Gitblit v1.9.3