From 2ed87847a1770a38eec8ef7cf5de9a8cd0bca847 Mon Sep 17 00:00:00 2001
From: Henry <haifeng.li@goodbaby.com>
Date: Fri, 2 Jul 2021 13:39:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20update=20=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF=EF=BC=9B=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E9=83=A8=E5=88=86=E8=AF=AD=E5=8F=A5=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?sonarLint=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../code-generator/jdbc-template/jtdaoimpl.ftl        | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl b/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl
index 10701ce..f3e9388 100644
--- a/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl
@@ -30,7 +30,7 @@ public class ${classInfo.className}DaoImpl implements I${classInfo.className}Dao
         <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
             <#list classInfo.fieldList as fieldItem ><#if fieldItem_index gt 0 >${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}(),</#if></#list>
             <#list classInfo.fieldList as fieldItem ><#if fieldItem_index = 0 >${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}()</#if></#list>
-        </#if>;
+        </#if>);
     }
 
     @Override
@@ -41,9 +41,8 @@ public class ${classInfo.className}DaoImpl implements I${classInfo.className}Dao
     @Override
     public ${classInfo.className} findById(int id) {
         List<${classInfo.className}> list = jdbcTemplate.query("select * from ${classInfo.tableName} where <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0><#list classInfo.fieldList as fieldItem ><#if fieldItem_index = 0>${fieldItem.columnName}=?<#break ></#if></#list></#if>", new Object[]{id}, new BeanPropertyRowMapper<${classInfo.className}>(${classInfo.className}.class));
-        if(list!=null && list.size()>0){
-            ${classInfo.className} ${classInfo.className?uncap_first} = list.get(0);
-            return ${classInfo.className?uncap_first};
+        if(list!=null && !list.isEmpty() ){
+            return  list.get(0);
         }else{
              return null;
         }
@@ -52,10 +51,10 @@ public class ${classInfo.className}DaoImpl implements I${classInfo.className}Dao
     @Override
     public List<${classInfo.className}> findAllList(Map<String,Object> params) {
         List<${classInfo.className}> list = jdbcTemplate.query("select * from ${classInfo.tableName}", new Object[]{}, new BeanPropertyRowMapper<${classInfo.className}>(${classInfo.className}.class));
-        if(list!=null && list.size()>0){
+        if(list!=null && !list.isEmpty() ){
             return list;
         }else{
-            return null;
+            return Collections.emptyList();
         }
     }