From 3618842f441145de5ed15d3d246bd8603448c18f Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Tue, 9 Jan 2024 19:12:16 +0800 Subject: [PATCH] =?UTF-8?q?[issue/5787]=E5=A2=9E=E5=8A=A0=E9=9D=9E?= =?UTF-8?q?=E7=A9=BA=E5=88=A4=E6=96=AD=E9=98=B2=E6=AD=A2=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=97=B6=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/code-template-online/common/utils.ftl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl index 44724746..b7cc7da0 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl +++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl @@ -153,7 +153,9 @@ <#assign extAttrs="${dictCode},"> <#elseif po.classType=='cat_tree'> <#-- 分类字典树 --> - <#assign extAttrs="pcode: '${po.dictField}',"> + <#-- update-begin---author:chenrui ---date:20240109 for：[issue/5787]增加非空判断防止代码生成时空指针异常---------- --> + <#assign extAttrs="pcode: '${po.dictField?default('')}',"> + <#-- update-end---author:chenrui ---date:20240109 for：[issue/5787]增加非空判断防止代码生成时空指针异常---------- --> <#elseif po.classType=='sel_tree'> <#-- 自定义树 --> <#if po.dictText??> @@ -166,10 +168,14 @@ <#assign extAttrs="hasChildField: '${po.dictText?split(',')[3]}'"> - <#assign extAttrs="${extAttrs}, pidValue: '${po.dictField}',"> + <#-- update-begin---author:chenrui ---date:20240109 for：[issue/5787]增加非空判断防止代码生成时空指针异常---------- --> + <#assign extAttrs="${extAttrs}, pidValue: '${po.dictField?default('')}',"> + <#-- update-end---author:chenrui ---date:20240109 for：[issue/5787]增加非空判断防止代码生成时空指针异常---------- --> <#elseif po.classType=='popup'> <#-- popup --> - <#if po.dictText?default("")?trim?length gt 1 && po.dictText?index_of(',') gt 0> + <#-- update-begin---author:chenrui ---date:20240109 for：[issue/5787]增加非空判断防止代码生成时空指针异常---------- --> + <#if po.dictText?default("")?trim?length gt 1 && po.dictText?index_of(',') gt 0 && po.dictField?default("")?trim?length gt 1> + <#-- update-begin---author:chenrui ---date:20240109 for：[issue/5787]增加非空判断防止代码生成时空指针异常---------- --> <#-- 如果有多个回填字段,找到popup字段对应的来源字段 --> <#assign orgFieldIx=po.dictText?split(',')?seq_index_of(po.fieldDbName)> <#assign orgField=po.dictField?split(',')[orgFieldIx]>