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/QuickEntryServiceImpl.java

@@ -65,16 +65,6 @@
        }
        // 将管理快速入口编辑DTO的属性复制到管理快速入口中
        BeanUtils.copyProperties(mgtQuickEntryEditDto, quickEntry);
        if(quickEntry.getTargetType()==1){
            quickEntry.setJumpType(null);
            quickEntry.setJumpId(null);
        }else if(quickEntry.getTargetType()==2){
            quickEntry.setLinkUrl(null);
        }else if(quickEntry.getTargetType()==3){
            quickEntry.setLinkUrl(null);
            quickEntry.setJumpType(null);
            quickEntry.setJumpId(null);
        }
        // 设置创建时间和创建者ID
        quickEntry.setCreateTime(new Date());
        quickEntry.setCreateUserId(mgtQuickEntryEditDto.getEntryId());
@@ -95,10 +85,17 @@
        if(quickEntry.getTargetType()==1){
            quickEntry.setJumpType(null);
            quickEntry.setJumpId(null);
            quickEntry.setLinkType(null);
        }else if(quickEntry.getTargetType()==2){
            quickEntry.setLinkUrl(null);
            if(quickEntry.getLinkType()==1){
                quickEntry.setJumpType(null);
                quickEntry.setJumpId(null);
            }else{
                quickEntry.setLinkUrl(null);
            }
        }else if(quickEntry.getTargetType()==3){
            quickEntry.setLinkUrl(null);
            quickEntry.setLinkType(null);
            quickEntry.setJumpType(null);
            quickEntry.setJumpId(null);
        }