diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java index 9b2689d..b5b323b 100644 --- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java +++ b/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 { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { registry.addResourceHandler("/**") - .addResourceLocations("file:" + upLoadPath + "//", "file:" + webAppPath + "//") + //update-begin-author:taoyan date:20211116 for: jeecg.path.webapp配置无效 #3126 + .addResourceLocations("file:" + upLoadPath + "//") + .addResourceLocations("file:" + webAppPath + "//") + //update-end-author:taoyan date:20211116 for: jeecg.path.webapp配置无效 #3126 .addResourceLocations(staticLocations.split(",")); } @@ -72,9 +75,9 @@ public class WebMvcConfiguration implements WebMvcConfigurer { } /** - * 添加Long转json精度丢失的配置 - * @Return: void - */ + * 添加Long转json精度丢失的配置 + * @Return: void + */ @Override public void configureMessageConverters(List<HttpMessageConverter<?>> converters) { MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter(); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml index 15d8f5d..58539d3 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml @@ -126,9 +126,11 @@ <select id="queryTreeList" parameterType="Object" resultType="org.jeecg.modules.system.model.TreeSelectModel"> select ${text} as "title", ${code} as "key", + <!-- udapte-begin-author:taoyan date:20211115 for: 自定义树控件只显示父节点,子节点无法展开 (此处还原不可再改) /issues/I4HZAL --> <if test="hasChildField != null and hasChildField != ''"> - ${hasChildField} as "isLeaf", + (case when ${hasChildField} = '1' then 0 else 1 end) as isLeaf, </if> + <!-- udapte-end-author:taoyan date:20211115 for: 自定义树控件只显示父节点,子节点无法展开 (此处还原不可再改) /issues/I4HZAL --> ${pidField} as parentId from ${table} where