From e7b5f646387af071b879808cef410a698de684d6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 30 六月 2025 12:01:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java | 20 --------------------
1 files changed, 0 insertions(+), 20 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 11fcea8..d49f958 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
@@ -65,16 +65,6 @@
}
// 将管理弹窗编辑DTO的属性复制到管理弹窗中
BeanUtils.copyProperties(mgtPopEditDto, pop);
- if(pop.getTargetType()==1){
- pop.setJumpType(null);
- pop.setJumpId(null);
- }else if(pop.getTargetType()==2){
- pop.setLinkUrl(null);
- }else if(pop.getTargetType()==3){
- pop.setLinkUrl(null);
- pop.setJumpType(null);
- pop.setJumpId(null);
- }
// 设置创建时间和创建者ID
pop.setCreateTime(new Date());
pop.setCreateUserId(mgtPopEditDto.getPopId());
@@ -98,16 +88,6 @@
@Override
public MgtPopGetVo getMgtPop(Long popId){
Pop pop = this.getById(popId);
- if(pop.getTargetType()==1){
- pop.setJumpType(null);
- pop.setJumpId(null);
- }else if(pop.getTargetType()==2){
- pop.setLinkUrl(null);
- }else if(pop.getTargetType()==3){
- pop.setLinkUrl(null);
- pop.setJumpType(null);
- pop.setJumpId(null);
- }
MgtPopGetVo mgtPopGetVo = new MgtPopGetVo();
BeanUtils.copyProperties(pop, mgtPopGetVo);
return mgtPopGetVo;
--
Gitblit v1.7.1