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 | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 682e504..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
@@ -82,6 +82,23 @@
@Override
public MgtQuickEntryGetVo getMgtQuickEntry(Long quickEntryId){
QuickEntry quickEntry = this.getById(quickEntryId);
+ if(quickEntry.getTargetType()==1){
+ quickEntry.setJumpType(null);
+ quickEntry.setJumpId(null);
+ quickEntry.setLinkType(null);
+ }else if(quickEntry.getTargetType()==2){
+ 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);
+ }
MgtQuickEntryGetVo mgtQuickEntryGetVo = new MgtQuickEntryGetVo();
BeanUtils.copyProperties(quickEntry, mgtQuickEntryGetVo);
return mgtQuickEntryGetVo;
@@ -98,7 +115,6 @@
public void deleteMgtQuickEntry(MgtBaseGetDto mgtBaseGetDto){
QuickEntry quickEntry = this.getById(Long.valueOf(mgtBaseGetDto.getId()));
quickEntry.setDelFlag(1);
- quickEntry.insertOrUpdate();
this.saveOrUpdate(quickEntry);
}
}
--
Gitblit v1.7.1