diff --git a/skyeye-web/src/main/resources/dbmapper/CodeModelMapper.xml b/skyeye-web/src/main/resources/dbmapper/CodeModelMapper.xml index 376ad2a596e86dfbac7bb7b3ac1eb1fa0f10eb35..31368081fd2ffc913b3a6d789999f99fa7ed42f3 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} diff --git a/skyeye-web/src/main/resources/mapping/reqmapping.xml b/skyeye-web/src/main/resources/mapping/reqmapping.xml index cc5af3cd2085345e624831302db2028a7106cb9f..d394a26a8e2d1562a6032b5b81307dfc376f0536 100644 --- a/skyeye-web/src/main/resources/mapping/reqmapping.xml +++ b/skyeye-web/src/main/resources/mapping/reqmapping.xml @@ -329,6 +329,7 @@ + diff --git a/skyeye-web/src/main/webapp/js/codemodel/codemodeledit.js b/skyeye-web/src/main/webapp/js/codemodel/codemodeledit.js index 359ca04aabea992251c03b882c5b8021cdb3293e..e3d4e233c7f50a7e2fc354ed57cc997c6cb1bdc6 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 };