From 16d8b71e21dc7298b30f46bf264cd9b3589a6978 Mon Sep 17 00:00:00 2001
From: who's hu <hup_dev@outlook.com>
Date: 星期二, 22 八月 2023 17:25:19 +0800
Subject: [PATCH] update ruoyi-ui/src/permission.js. 由于重定向url存在 http://xxx.xx.xxx/{id}?param={a}&name={b} 的场景, 当未登录访问时, 通过改js封装登录后重定向参数, 会丢失?后的query params 如: 访问 http://localhost:1024/core/doc/doc?id=1683734914907807745&version=31 期望 http://localhost:1024/login?redirect=%2Fcore%2Fdoc%2Fdoc%3Fid%3D1683734914907807745%26version%3D31 实际通过 to.fullPath 封装后 获得 http://localhost:1024/login?redirect=%2Fcore%2Fdoc%2Fdoc%3Fid%3D1683734914907807745&version=31
---
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index b1b3c40..116f6c5 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -34,13 +34,13 @@
/**
* 查询${functionName}
*
- * @param ${pkColumn.javaField} ${functionName}ID
+ * @param ${pkColumn.javaField} ${functionName}主键
* @return ${functionName}
*/
@Override
- public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField})
+ public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
{
- return ${className}Mapper.select${ClassName}ById(${pkColumn.javaField});
+ return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
}
/**
@@ -108,34 +108,37 @@
/**
* 批量删除${functionName}
*
- * @param ${pkColumn.javaField}s 需要删除的${functionName}ID
+ * @param ${pkColumn.javaField}s 需要删除的${functionName}主键
* @return 结果
*/
#if($table.sub)
@Transactional
#end
@Override
- public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s)
+ public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
{
#if($table.sub)
${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
#end
- return ${className}Mapper.delete${ClassName}ByIds(${pkColumn.javaField}s);
+ return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
}
/**
* 删除${functionName}信息
*
- * @param ${pkColumn.javaField} ${functionName}ID
+ * @param ${pkColumn.javaField} ${functionName}主键
* @return 结果
*/
+#if($table.sub)
+ @Transactional
+#end
@Override
- public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField})
+ public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
{
#if($table.sub)
${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
#end
- return ${className}Mapper.delete${ClassName}ById(${pkColumn.javaField});
+ return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
}
#if($table.sub)
@@ -147,7 +150,7 @@
public void insert${subClassName}(${ClassName} ${className})
{
List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
- Long ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
+ ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
if (StringUtils.isNotNull(${subclassName}List))
{
List<${subClassName}> list = new ArrayList<${subClassName}>();
--
Gitblit v1.9.2