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/QuickEntryServiceImpl.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/QuickEntryServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/QuickEntryServiceImpl.java
index 42b4ade..40f5e7a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/QuickEntryServiceImpl.java
+++ b/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);
}
--
Gitblit v1.7.1