Commit c3f5492dbbeb91eb7dd56bfe74dd05920fe961be
1 parent
5ffa6998
oracle数据库,在线表单编辑保存会报错issues/I4HW20
暂时删除vue3模板,因为vue3前端项目未正式发布,减少大家的误解
Showing
2 changed files
with
10 additions
and
5 deletions
jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java
... | ... | @@ -41,7 +41,10 @@ public class WebMvcConfiguration implements WebMvcConfigurer { |
41 | 41 | @Override |
42 | 42 | public void addResourceHandlers(ResourceHandlerRegistry registry) { |
43 | 43 | registry.addResourceHandler("/**") |
44 | - .addResourceLocations("file:" + upLoadPath + "//", "file:" + webAppPath + "//") | |
44 | + //update-begin-author:taoyan date:20211116 for: jeecg.path.webapp配置无效 #3126 | |
45 | + .addResourceLocations("file:" + upLoadPath + "//") | |
46 | + .addResourceLocations("file:" + webAppPath + "//") | |
47 | + //update-end-author:taoyan date:20211116 for: jeecg.path.webapp配置无效 #3126 | |
45 | 48 | .addResourceLocations(staticLocations.split(",")); |
46 | 49 | } |
47 | 50 | |
... | ... | @@ -72,9 +75,9 @@ public class WebMvcConfiguration implements WebMvcConfigurer { |
72 | 75 | } |
73 | 76 | |
74 | 77 | /** |
75 | - * 添加Long转json精度丢失的配置 | |
76 | - * @Return: void | |
77 | - */ | |
78 | + * 添加Long转json精度丢失的配置 | |
79 | + * @Return: void | |
80 | + */ | |
78 | 81 | @Override |
79 | 82 | public void configureMessageConverters(List<HttpMessageConverter<?>> converters) { |
80 | 83 | MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter(); |
... | ... |
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
... | ... | @@ -126,9 +126,11 @@ |
126 | 126 | <select id="queryTreeList" parameterType="Object" resultType="org.jeecg.modules.system.model.TreeSelectModel"> |
127 | 127 | select ${text} as "title", |
128 | 128 | ${code} as "key", |
129 | + <!-- udapte-begin-author:taoyan date:20211115 for: 自定义树控件只显示父节点,子节点无法展开 (此处还原不可再改) /issues/I4HZAL --> | |
129 | 130 | <if test="hasChildField != null and hasChildField != ''"> |
130 | - ${hasChildField} as "isLeaf", | |
131 | + (case when ${hasChildField} = '1' then 0 else 1 end) as isLeaf, | |
131 | 132 | </if> |
133 | + <!-- udapte-end-author:taoyan date:20211115 for: 自定义树控件只显示父节点,子节点无法展开 (此处还原不可再改) /issues/I4HZAL --> | |
132 | 134 | ${pidField} as parentId |
133 | 135 | from ${table} |
134 | 136 | where |
... | ... |