diff --git a/module-freemarker/src/main/resources/mybatis/mapper/templateconfig/templateconfig-mapper.xml b/module-freemarker/src/main/resources/mybatis/mapper/templateconfig/templateconfig-mapper.xml index 8d01de5..c61ba17 100644 --- a/module-freemarker/src/main/resources/mybatis/mapper/templateconfig/templateconfig-mapper.xml +++ b/module-freemarker/src/main/resources/mybatis/mapper/templateconfig/templateconfig-mapper.xml @@ -14,6 +14,7 @@ + @@ -29,6 +30,7 @@ template_all_generate, template_file_type, template_mode, + template_project, creator, gmt_create, modifier, @@ -46,6 +48,7 @@ #{templateAllGenerate}, #{templateFileType}, #{templateMode}, + #{templateProject}, #{creator}, #{gmtCreate}, #{modifier}, @@ -114,6 +117,9 @@ template_mode = #{templateMode}, + + + template_project = #{templateProject}, modifier = #{modifier}, gmt_modified = #{gmtModified} @@ -133,7 +139,8 @@ t1.template_file, t1.template_all_generate, t1.template_file_type, - t1.template_mode + t1.template_mode, + t1.template_project FROM m_template_config t1 WHERE @@ -152,7 +159,8 @@ t1.template_file, t1.template_all_generate, t1.template_file_type, - t1.template_mode + t1.template_mode, + t1.template_project FROM m_template_config t1 WHERE @@ -175,7 +183,8 @@ t1.template_file, t1.template_all_generate, t1.template_file_type, - t1.template_mode + t1.template_mode, + t1.template_project FROM m_template_config t1 WHERE @@ -186,6 +195,9 @@ t1.template_name LIKE CONCAT('%', #{keywords}, '%') ) + + AND t1.template_project = #{templateProject} + AND LEFT(t1.gmt_create, 10) = ]]> #{startTime} diff --git a/module-freemarker/src/main/resources/mybatis/mapper/templaterecord/templaterecord-mapper.xml b/module-freemarker/src/main/resources/mybatis/mapper/templaterecord/templaterecord-mapper.xml index 0ab96be..bb91476 100644 --- a/module-freemarker/src/main/resources/mybatis/mapper/templaterecord/templaterecord-mapper.xml +++ b/module-freemarker/src/main/resources/mybatis/mapper/templaterecord/templaterecord-mapper.xml @@ -153,6 +153,9 @@ t1.template_record_id LIKE CONCAT('%', #{keywords}, '%') ) + + AND t2.template_project = #{templateProject} + AND LEFT(t1.gmt_create, 10) = ]]> #{startTime} diff --git a/module-freemarker/src/main/resources/templates/templateconfig/list-templateconfig.html b/module-freemarker/src/main/resources/templates/templateconfig/list-templateconfig.html index 8969445..9252e98 100644 --- a/module-freemarker/src/main/resources/templates/templateconfig/list-templateconfig.html +++ b/module-freemarker/src/main/resources/templates/templateconfig/list-templateconfig.html @@ -26,6 +26,7 @@
+
@@ -50,6 +51,14 @@ +