修改数据库字段映射关键字转义问题

appbuild-manager/src/main/resources/template/java/serviceImpl-tree.java.ftl

@@ -98,7 +98,7 @@ public class ${ClassName}ServiceImpl extends ${Service}<${ClassName}Dao, ${Class
 
         ${ClassName?uncap_first}Entity.setStatus(SatusEnum.ENABLE.getValue());
         ${ClassName?uncap_first}Entity.setUpdateTime(new Date());
-        ${ClassName?uncap_first}Entity.setUpdateUser(context.getUser().getLoginName());
+        ${ClassName?uncap_first}Entity.setUpdateUser(context==null?"":context.getUser().getLoginName());
         ${ClassName}Entity condition = new ${ClassName}Entity();
         condition.set${pkColumn.javaField?cap_first}(${ClassName?uncap_first}Entity.get${pkColumn.javaField?cap_first}());
         this.updateBatch(${ClassName?uncap_first}Entity, condition, context);

appbuild-manager/src/main/resources/template/java/serviceImpl.java.ftl

@@ -72,8 +72,8 @@ public class ${ClassName}ServiceImpl extends ${Service}<${ClassName}Dao, ${Class
             </#if>
             </#if>
                 item.set${subTableFkClassName}(entity.get${pkColumn.javaField?cap_first}());
-                item.setCreateUser(context.getUser().getLoginName());
-                item.setCreateUserId(context.getUser().getId());
+                item.setCreateUser(context==null?"":context.getUser().getLoginName());
+                item.setCreateUserId(context==null?"":context.getUser().getId());
                 item.setCreateTime(new Date());
             }).count();
             ${subclassName}Service.save(entity.get${subClassName}List());
@@ -97,11 +97,11 @@ public class ${ClassName}ServiceImpl extends ${Service}<${ClassName}Dao, ${Class
             </#if>
         </#if>
                 item.set${subTableFkClassName}(entity.get${pkColumn.javaField?cap_first}());
-                item.setCreateUser(context.getUser().getLoginName());
-                item.setCreateUserId(context.getUser().getId());
+                item.setCreateUser(context==null?"":context.getUser().getLoginName());
+                item.setCreateUserId(context==null?"":context.getUser().getId());
                 item.setCreateTime(new Date());
-                item.setUpdateUser(context.getUser().getLoginName());
-                item.setUpdateUserId(context.getUser().getId());
+                item.setUpdateUser(context==null?"":context.getUser().getLoginName());
+                item.setUpdateUserId(context==null?"":context.getUser().getId());
                 item.setUpdateTime(new Date());
             }).count();
             ${subclassName}Service.save(entity.get${subClassName}List());
@@ -134,8 +134,8 @@ public class ${ClassName}ServiceImpl extends ${Service}<${ClassName}Dao, ${Class
             ${subclassName}Entity.set${subPkColumn.javaField?cap_first}(IdUtil.getSnowflake(1024,512).nextId());
         </#if>
             ${subclassName}Entity.set${subTableFkClassName}(entity.get${pkColumn.javaField?cap_first}());
-            ${subclassName}Entity.setCreateUser(context.getUser().getLoginName());
-            ${subclassName}Entity.setCreateUserId(context.getUser().getId());
+            ${subclassName}Entity.setCreateUser(context==null?"":context.getUser().getLoginName());
+            ${subclassName}Entity.setCreateUserId(context==null?"":context.getUser().getId());
             ${subclassName}Entity.setCreateTime(new Date());
             ${subclassName}Service.save(${subclassName}Entity,context);
         }
@@ -146,8 +146,8 @@ public class ${ClassName}ServiceImpl extends ${Service}<${ClassName}Dao, ${Class
     protected void updateAfter(${ClassName}Entity entity, Context context) throws AppException {
         if(!ObjectUtils.isEmpty(entity.get${subClassName}Entity())){
             ${subClassName}Entity subEntity=entity.get${subClassName}Entity();
-            subEntity.setUpdateUser(context.getUser().getLoginName());
-            subEntity.setUpdateUserId(context.getUser().getId());
+            subEntity.setUpdateUser(context==null?"":context.getUser().getLoginName());
+            subEntity.setUpdateUserId(context==null?"":context.getUser().getId());
             subEntity.setUpdateTime(new Date());
             ${subclassName}Service.update(subEntity,context);
         }

appbuild-manager/src/main/resources/template/xml/sqlMap.xml.ftl

@@ -15,9 +15,9 @@
     <resultMap type="${ClassName}Entity" id="${ClassName}Entity-Map">
         <#list columns as column>
         <#if column.isPrimaryKey==1>
-            <id  property="${column.javaField}" column="${column.isKeyWord(column.columnName)}" />
+            <id  property="${column.javaField}" column="${column.columnName}" />
             <#else >
-            <result property="${column.javaField}" column="${column.isKeyWord(column.columnName)}" />
+            <result property="${column.javaField}" column="${column.columnName}" />
         </#if>
         </#list>
             ${SubArray}
@@ -25,7 +25,7 @@
     <#if table.tplCategory=="sub" ||table.tplCategory=="subone">
     <resultMap type="${subClassName}Entity" id="${subClassName}Entity-Map">
         <#list subTable.columns as column>
-            <result property="${column.javaField}" column="${column.isKeyWord(column.columnName)}" />
+            <result property="${column.javaField}" column="${column.columnName}" />
         </#list>
     </resultMap>
     </#if>