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/mapper.java.vm | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
index 282d9ea..7e7d7c2 100644
--- a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
@@ -17,10 +17,10 @@
/**
* 查询${functionName}
*
- * @param ${pkColumn.javaField} ${functionName}ID
+ * @param ${pkColumn.javaField} ${functionName}主键
* @return ${functionName}
*/
- public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
+ public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
/**
* 查询${functionName}列表
@@ -49,24 +49,24 @@
/**
* 删除${functionName}
*
- * @param ${pkColumn.javaField} ${functionName}ID
+ * @param ${pkColumn.javaField} ${functionName}主键
* @return 结果
*/
- public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
+ public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
/**
* 批量删除${functionName}
*
- * @param ${pkColumn.javaField}s 需要删除的数据ID
+ * @param ${pkColumn.javaField}s 需要删除的数据主键集合
* @return 结果
*/
- 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)
/**
* 批量删除${subTable.functionName}
*
- * @param customerIds 需要删除的数据ID
+ * @param ${pkColumn.javaField}s 需要删除的数据主键集合
* @return 结果
*/
public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
@@ -81,7 +81,7 @@
/**
- * 通过${functionName}ID删除${subTable.functionName}信息
+ * 通过${functionName}主键删除${subTable.functionName}信息
*
* @param ${pkColumn.javaField} ${functionName}ID
* @return 结果
--
Gitblit v1.9.2