From fe83afe402045111b792d11029507b687ea92c1e Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Tue, 6 Nov 2018 15:03:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E6=9D=BF=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 skyeye-web/src/main/resources/dbmapper/CodeModelMapper.xml | 1 +
 skyeye-web/src/main/resources/mapping/reqmapping.xml       | 1 +
 skyeye-web/src/main/webapp/js/codemodel/codemodeledit.js   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/skyeye-web/src/main/resources/dbmapper/CodeModelMapper.xml b/skyeye-web/src/main/resources/dbmapper/CodeModelMapper.xml
index 376ad2a59..31368081f 100644
--- a/skyeye-web/src/main/resources/dbmapper/CodeModelMapper.xml
+++ b/skyeye-web/src/main/resources/dbmapper/CodeModelMapper.xml
@@ -64,6 +64,7 @@
 		WHERE a.id != #{id}
 			AND a.group_id = #{groupId}
 			AND a.model_name = #{modelName}
+			AND a.model_type = #{modelType}
 	</select>
 	
 	<update id="editCodeModelMationById" parameterType="java.util.Map">
diff --git a/skyeye-web/src/main/resources/mapping/reqmapping.xml b/skyeye-web/src/main/resources/mapping/reqmapping.xml
index cc5af3cd2..d394a26a8 100644
--- a/skyeye-web/src/main/resources/mapping/reqmapping.xml
+++ b/skyeye-web/src/main/resources/mapping/reqmapping.xml
@@ -329,6 +329,7 @@
 		<property id="modelContent" name="modelContent" ref="required" var="模板内容"/>
 		<property id="modelText" name="modelText" ref="required" var="模板纯文本"/>
 		<property id="groupId" name="groupId" ref="required" var="分组id"/>
+		<property id="modelType" name="modelType" ref="required" var="模板类型"/>
 		<property id="rowId" name="id" ref="required" var="模板id"/>
 	</url>
 	<url id="codemodel011" path="/post/CodeModelGroupController/queryTableParameterByTableName" val="根据表名获取表的相关信息" allUse="1">
diff --git a/skyeye-web/src/main/webapp/js/codemodel/codemodeledit.js b/skyeye-web/src/main/webapp/js/codemodel/codemodeledit.js
index 359ca04aa..e3d4e233c 100644
--- a/skyeye-web/src/main/webapp/js/codemodel/codemodeledit.js
+++ b/skyeye-web/src/main/webapp/js/codemodel/codemodeledit.js
@@ -71,6 +71,7 @@ layui.config({
 			        			modelName: $("#modelName").val(),
 			        			modelContent: encodeURI(editor.getValue()),
 			        			modelText: encodeURI(editor.getValue()),
+			        			modelType: $("#modelType").val(),
 			        			groupId: parent.groupId,
 			        			rowId: parent.rowId
 				        	};
-- 
GitLab