!877 fix 修复代码生成模板导出逻辑与多余空行问题

* fix 修复代码生成模板导出逻辑与多余空行问题

ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/controller.java.ftl

@@ -59,10 +59,10 @@ public class ${ClassName}Controller extends BaseController {
     }
 </#if>
 
+<#if enableExport>
     /**
      * 导出${functionName}列表
      */
-<#if enableExport>
     @SaCheckPermission("${permissionPrefix}:export")
     @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -153,5 +153,3 @@ public class ${ClassName}Controller extends BaseController {
         return toAjax(${className}Service.deleteWithValidByIds(List.of(${pkColumn.javaField}s), true));
     }
 }
-
-

ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/domain.java.ftl

@@ -46,5 +46,3 @@ public class ${ClassName} extends BaseEntity {
 </#list>
 
 }
-
-

ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/mapper.java.ftl

@@ -13,6 +13,3 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 public interface ${ClassName}Mapper extends BaseMapperPlus<${ClassName}, ${ClassName}Vo> {
 
 }
-
-
-

ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/service.java.ftl

@@ -101,7 +101,5 @@ public interface I${ClassName}Service {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
+
 }
-
-
-

ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/serviceImpl.java.ftl

@@ -43,7 +43,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
 
     private final ${ClassName}Mapper ${className}Mapper;
 
-/**
+    /**
      * 查询${functionName}
      *
      * @param ${pkColumn.javaField} 主键
@@ -342,6 +342,5 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
         }
         return ${className}Mapper.deleteByIds(ids) > 0;
     }
+
 }
-
-

ruoyi-modules/ruoyi-gen/src/main/resources/fm/java/vo.java.ftl

@@ -17,8 +17,6 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-
-
 /**
  * ${functionName}视图对象 ${tableName}
  *
@@ -61,5 +59,3 @@ public class ${ClassName}Vo implements Serializable {
 </#list>
 
 }
-
-

ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/mysql.sql.ftl

@@ -14,9 +14,7 @@ values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, 3,  '#
 
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, 4,  '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:remove',       '#', 1761000000000000103, 1761100000000000001, sysdate(), null, null, '');
-
+<#if enableExport>
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, 5,  '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:export',       '#', 1761000000000000103, 1761100000000000001, sysdate(), null, null, '');
-
+</#if>
-
-

ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/oracle.sql.ftl

@@ -14,9 +14,7 @@ values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, 3,  '#
 
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, 4,  '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:remove',       '#', 1761000000000000103, 1761100000000000001, sysdate, null, null, '');
-
+<#if enableExport>
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, 5,  '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:export',       '#', 1761000000000000103, 1761100000000000001, sysdate, null, null, '');
-
+</#if>
-
-

ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/postgres.sql.ftl

@@ -14,10 +14,7 @@ values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, 3,  '#
 
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, 4,  '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:remove',       '#', 1761000000000000103, 1761100000000000001, now(), null, null, '');
-
+<#if enableExport>
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, 5,  '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:export',       '#', 1761000000000000103, 1761100000000000001, now(), null, null, '');
-
+</#if>
-
-
-

ruoyi-modules/ruoyi-gen/src/main/resources/fm/sql/sqlserver.sql.ftl

@@ -14,9 +14,7 @@ values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, 3,  '#
 
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, 4,  '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:remove',       '#', 1761000000000000103, 1761100000000000001, getdate(), null, null, '');
-
+<#if enableExport>
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, 5,  '#', '', 'N', 'Y', 'F', '0', '0', '${permissionPrefix}:export',       '#', 1761000000000000103, 1761100000000000001, getdate(), null, null, '');
-
+</#if>
-
-

ruoyi-modules/ruoyi-gen/src/main/resources/fm/vue/api.ts.ftl

@@ -10,7 +10,6 @@ import request from '@/utils/request';
  * @param query
  * @returns {*}
  */
-
 export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise<<#if table.tree>${BusinessName}VO[]<#else>PageResult<${BusinessName}VO></#if>> => {
   return request({
     url: '/${moduleName}/${businessName}/list',
@@ -100,5 +99,3 @@ export const del${BusinessName} = (${pkColumn.javaField}: string | number | Arra
     method: 'delete'
   });
 };
-
-

ruoyi-modules/ruoyi-gen/src/main/resources/fm/xml/mapper.xml.ftl

@@ -4,6 +4,3 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="${packageName}.mapper.${ClassName}Mapper">
 </mapper>
-
-
-