From 4b21a3bc48963ef6e85de832ca05f7b6ee40f6dc Mon Sep 17 00:00:00 2001
From: wangfeiyu <wangfeiyu@cscec.com>
Date: Wed, 22 Feb 2023 08:54:10 +0800
Subject: [PATCH] 在方法isMatchedIp的参数中，当filter为null而ip非null/空时，报filter为null异常。把判断条件由&&改为||解决此bug。
---
ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm
index af422f3..250f68c 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm
@@ -14,10 +14,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}列表
@@ -46,16 +46,16 @@
/**
* 批量删除${functionName}
*
- * @param ${pkColumn.javaField}s 需要删除的${functionName}ID
+ * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合
* @return 结果
*/
- public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+ public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
/**
* 删除${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});
}
--
Gitblit v1.9.3