From 33a8ab3280a8de53cda76510e5ce83a06b54edff Mon Sep 17 00:00:00 2001 From: zhoumingfa Date: Fri, 25 Oct 2024 14:44:50 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E6=A8=A1=E5=9D=97=E7=9A=84=E8=8F=9C=E5=8D=95SQL?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8D=E7=BC=93=E5=AD=98=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../variable/backend/domain/MapperVariableService.java | 8 ++++---- .../code-generator-template/java/dao/Dao.java.vm | 4 ++-- .../code-generator-template/java/sql/Menu.sql.vm | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java index 14f8ff5f..68b77e45 100644 --- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java +++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java @@ -40,7 +40,7 @@ public class MapperVariableService extends CodeGenerateBaseVariableService { List columnNameList = queryField.getColumnNameList(); if (columnNameList.size() == 1) { // AND INSTR(t_notice.title,#{query.keywords}) - stringBuilder.append(" AND INSTR(") + stringBuilder.append("AND INSTR(") .append(form.getTableName()).append(".").append(queryField.getColumnNameList().get(0)) .append(",#{queryForm.") .append(queryField.getFieldName()) @@ -48,21 +48,21 @@ public class MapperVariableService extends CodeGenerateBaseVariableService { } else { for (int i = 0; i < columnNameList.size(); i++) { if (i == 0) { - stringBuilder.append("AND ( INSTR(") + stringBuilder.append("AND (\n INSTR(") .append(form.getTableName()).append(".").append(queryField.getColumnNameList().get(i)) .append(",#{queryForm.") .append(queryField.getFieldName()) .append("})"); } else { // OR INSTR(t_notice.author,#{query.keywords}) - stringBuilder.append("\n OR INSTR(") + stringBuilder.append("\n OR INSTR(") .append(form.getTableName()).append(".").append(queryField.getColumnNameList().get(i)) .append(",#{queryForm.") .append(queryField.getFieldName()) .append("})"); } } - stringBuilder.append("\n )"); + stringBuilder.append("\n )"); } fieldMap.put("likeStr", stringBuilder.toString()); } else if (CodeQueryFieldQueryTypeEnum.DICT.equalsValue(queryField.getQueryTypeEnum())) { diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm index 938b758e..a4bd167f 100644 --- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm +++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm @@ -37,14 +37,14 @@ public interface ${name.upperCamel}Dao extends BaseMapper<${name.upperCamel}Enti /** * 更新删除状态 */ - long updateDeleted(@Param("${primaryKeyFieldName}")${primaryKeyJavaType} ${primaryKeyFieldName},@Param("${deletedFlag}")boolean deletedFlag); + long updateDeleted(@Param("${primaryKeyFieldName}") ${primaryKeyJavaType} ${primaryKeyFieldName}, @Param("deletedFlag") boolean deletedFlag); #end #if($deleteInfo.deleteEnum == "Batch" || $deleteInfo.deleteEnum == "SingleAndBatch") /** * 批量更新删除状态 */ - void batchUpdateDeleted(@Param("idList")List<${primaryKeyJavaType}> idList,@Param("${deletedFlag}")boolean deletedFlag); + void batchUpdateDeleted(@Param("idList") List<${primaryKeyJavaType}> idList, @Param("deletedFlag") boolean deletedFlag); #end #end diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm index 90525f78..9ca5cc42 100644 --- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm +++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm @@ -10,13 +10,13 @@ SET @parent_id = NULL; SELECT t_menu.menu_id INTO @parent_id FROM t_menu WHERE t_menu.menu_name = '${basic.description}'; INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id ) -VALUES ( '查询', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:query', 1, @parent_id, 1 ); +VALUES ( '查询', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:query', 1, @parent_id, 1 ); INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id ) -VALUES ( '添加', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:add', 1, @parent_id, 1 ); +VALUES ( '添加', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:add', 1, @parent_id, 1 ); INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id ) -VALUES ( '更新', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:update', 1, @parent_id, 1 ); +VALUES ( '更新', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:update', 1, @parent_id, 1 ); INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id ) -VALUES ( '删除', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:delete', 1, @parent_id, 1 ); +VALUES ( '删除', 3, @parent_id, false, false, true, false, '${name.lowerCamel}:delete', 1, @parent_id, 1 );