From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java
index d110c71..b88451e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java
@@ -6,6 +6,7 @@
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.domain.dto.MgtPopEditDto;
import com.ruoyi.system.domain.pojo.config.Pop;
+import com.ruoyi.system.domain.vo.AppPopVo;
import com.ruoyi.system.domain.vo.MgtPopGetVo;
import com.ruoyi.system.domain.vo.MgtPopPageVo;
import com.ruoyi.system.mapper.config.PopMapper;
@@ -87,6 +88,23 @@
@Override
public MgtPopGetVo getMgtPop(Long popId){
Pop pop = this.getById(popId);
+ if(pop.getTargetType()==1){
+ pop.setJumpType(null);
+ pop.setJumpId(null);
+ pop.setLinkType(null);
+ }else if(pop.getTargetType()==2){
+ if(pop.getLinkType()==1){
+ pop.setJumpType(null);
+ pop.setJumpId(null);
+ }else{
+ pop.setLinkUrl(null);
+ }
+ }else if(pop.getTargetType()==3){
+ pop.setLinkUrl(null);
+ pop.setLinkType(null);
+ pop.setJumpType(null);
+ pop.setJumpId(null);
+ }
MgtPopGetVo mgtPopGetVo = new MgtPopGetVo();
BeanUtils.copyProperties(pop, mgtPopGetVo);
return mgtPopGetVo;
@@ -105,4 +123,16 @@
pop.setDelFlag(1);
this.saveOrUpdate(pop);
}
+
+ /**
+ * @description 获取首页弹窗
+ * @author jqs
+ * @date 2023/7/20 17:19
+ * @param
+ * @return AppPopVo
+ */
+ @Override
+ public AppPopVo getAppPop(){
+ return popMapper.getAppPop();
+ }
}
--
Gitblit v1.7.1