diff --git a/src/main/java/org/redkale/source/DataSqlMapper.java b/src/main/java/org/redkale/source/DataSqlMapper.java index 70a71dc9d..e79b5c617 100644 --- a/src/main/java/org/redkale/source/DataSqlMapper.java +++ b/src/main/java/org/redkale/source/DataSqlMapper.java @@ -44,14 +44,14 @@ import org.redkale.util.Sheet; * + " WHERE f.forumid = s.forumid AND " * + "s.forum_sectionid = #{bean.forumSectionid} AND " * + "f.forumid = #{bean.forumid} AND s.forum_section_color = #{bean.forumSectionColor}") - * public List<ForumResult> queryForumResult(ForumBean bean); + * public List<ForumResult> queryForumResult(@Param("bean") ForumBean bean0); * * @Sql("SELECT f.forum_groupid, s.forum_section_color " * + "FROM forum_info f, forum_section s " * + " WHERE f.forumid = s.forumid AND " * + "s.forum_sectionid = #{bean.forumSectionid} AND " * + "f.forumid = #{bean.forumid} AND s.forum_section_color = #{bean.forumSectionColor}") - * public CompletableFuture<List<ForumResult>> queryForumResultAsync(@Param("bean") ForumBean bean0); + * public CompletableFuture<List<ForumResult>> queryForumResultAsync(ForumBean bean); *} * *

diff --git a/src/main/java/org/redkale/util/Utility.java b/src/main/java/org/redkale/util/Utility.java index dc6c9d5ad..846edb94e 100644 --- a/src/main/java/org/redkale/util/Utility.java +++ b/src/main/java/org/redkale/util/Utility.java @@ -461,13 +461,26 @@ public final class Utility { return sb.toString(); } + /** + * 返回第一个不为null的对象 + * + * @param 泛型 + * @param val1 对象1 + * @param val2 对象2 + * + * @return 可用对象,可能返回null + */ + public static T orElse(T val1, T val2) { + return val1 == null ? val2 : val1; + } + /** * 返回第一个不为null的对象 * * @param 泛型 * @param vals 对象集合 * - * @return 可用对象,没有返回null + * @return 可用对象,可能返回null */ public static T orElse(T... vals) { for (T t : vals) { diff --git a/src/test/java/org/redkale/test/source/parser/ForumInfoMapper.java b/src/test/java/org/redkale/test/source/parser/ForumInfoMapper.java index 51782539e..79b0f6cd9 100644 --- a/src/test/java/org/redkale/test/source/parser/ForumInfoMapper.java +++ b/src/test/java/org/redkale/test/source/parser/ForumInfoMapper.java @@ -33,12 +33,12 @@ public interface ForumInfoMapper extends BaseMapper { + " WHERE f.forumid = s.forumid AND " + "s.forum_sectionid = #{bean.forumSectionid} AND " + "f.forumid = #{bean.forumid} AND s.forum_section_color = #{bean.forumSectionColor}") - public List queryForumResult(ForumBean bean); + public List queryForumResult(@Param("bean") ForumBean bean0); @Sql("SELECT f.forum_groupid, s.forum_section_color " + "FROM forum_info f, forum_section s " + " WHERE f.forumid = s.forumid AND " + "s.forum_sectionid = #{bean.forumSectionid} AND " + "f.forumid = #{bean.forumid} AND s.forum_section_color = #{bean.forumSectionColor}") - public CompletableFuture> queryForumResultAsync(@Param("bean") ForumBean bean0); + public CompletableFuture> queryForumResultAsync(ForumBean bean); }