From e7242d40110c8a157867acd2d1a1718fb640d4c5 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期五, 17 二月 2023 16:02:04 +0800
Subject: [PATCH] fix 修正 SysTenantServiceImpl#deleteWithValidByIds 超管租户可以被删除的问题, 加上 id 校验 ; fix 修正 tenant/index.vue handleUpdate 租户套餐回显问题 ;
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
index 2d89d77..671a350 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
@@ -10,6 +10,8 @@
import com.ruoyi.common.core.utils.ip.AddressUtils;
import com.ruoyi.common.log.event.OperLogEvent;
import com.ruoyi.system.domain.SysOperLog;
+import com.ruoyi.system.domain.bo.SysOperLogBo;
+import com.ruoyi.system.domain.vo.SysOperLogVo;
import com.ruoyi.system.mapper.SysOperLogMapper;
import com.ruoyi.system.service.ISysOperLogService;
import lombok.RequiredArgsConstructor;
@@ -41,14 +43,14 @@
@Async
@EventListener
public void recordOper(OperLogEvent operLogEvent) {
- SysOperLog operLog = BeanUtil.toBean(operLogEvent, SysOperLog.class);
+ SysOperLogBo operLog = BeanUtil.toBean(operLogEvent, SysOperLogBo.class);
// 杩滅▼鏌ヨ鎿嶄綔鍦扮偣
operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
insertOperlog(operLog);
}
@Override
- public TableDataInfo<SysOperLog> selectPageOperLogList(SysOperLog operLog, PageQuery pageQuery) {
+ public TableDataInfo<SysOperLogVo> selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery) {
Map<String, Object> params = operLog.getParams();
LambdaQueryWrapper<SysOperLog> lqw = new LambdaQueryWrapper<SysOperLog>()
.like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())
@@ -68,17 +70,18 @@
pageQuery.setOrderByColumn("oper_id");
pageQuery.setIsAsc("desc");
}
- Page<SysOperLog> page = baseMapper.selectPage(pageQuery.build(), lqw);
+ Page<SysOperLogVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(page);
}
/**
* 鏂板鎿嶄綔鏃ュ織
*
- * @param operLog 鎿嶄綔鏃ュ織瀵硅薄
+ * @param bo 鎿嶄綔鏃ュ織瀵硅薄
*/
@Override
- public void insertOperlog(SysOperLog operLog) {
+ public void insertOperlog(SysOperLogBo bo) {
+ SysOperLog operLog = BeanUtil.toBean(bo, SysOperLog.class);
operLog.setOperTime(new Date());
baseMapper.insert(operLog);
}
@@ -90,9 +93,9 @@
* @return 鎿嶄綔鏃ュ織闆嗗悎
*/
@Override
- public List<SysOperLog> selectOperLogList(SysOperLog operLog) {
+ public List<SysOperLogVo> selectOperLogList(SysOperLogBo operLog) {
Map<String, Object> params = operLog.getParams();
- return baseMapper.selectList(new LambdaQueryWrapper<SysOperLog>()
+ return baseMapper.selectVoList(new LambdaQueryWrapper<SysOperLog>()
.like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())
.eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
SysOperLog::getBusinessType, operLog.getBusinessType())
@@ -127,8 +130,8 @@
* @return 鎿嶄綔鏃ュ織瀵硅薄
*/
@Override
- public SysOperLog selectOperLogById(Long operId) {
- return baseMapper.selectById(operId);
+ public SysOperLogVo selectOperLogById(Long operId) {
+ return baseMapper.selectVoById(operId);
}
/**
--
Gitblit v1.9.3