Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 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());
@@ -101,10 +91,17 @@
        if(pop.getTargetType()==1){
            pop.setJumpType(null);
            pop.setJumpId(null);
            pop.setLinkType(null);
        }else if(pop.getTargetType()==2){
            pop.setLinkUrl(null);
            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);
        }