From 5467aa933d1d723707c2d8b7e022f2b7be57e645 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 1 Dec 2019 00:06:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A0=91?=
 =?UTF-8?q?=E8=A1=A8=E6=83=85=E5=86=B5=E4=B8=8B=E9=9D=9E=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=97=B6=E8=84=9A=E6=9C=AC=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/modules/gen/crud/controller.xml     | 6 ++++++
 .../resources/templates/modules/gen/query/controller.xml    | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
index 76df546d..46af085e 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
@@ -91,9 +91,15 @@ public class ${ClassName}Controller extends BaseController {
 		}
 		<% for(c in table.columnList){ %>
 			<% if(c.isQuery == "1" && !c.isTreeEntityColumn && c.attrName != 'status'){ %>
+				<% if(c.attrType == 'String'){ %>
 		if (StringUtils.isNotBlank(${className}.${c.attrNameForGetMethod})){
 			${className}.setParentCode(null);
 		}
+				<% }else{ %>
+		if (${className}.${c.attrNameForGetMethod} != null){
+			${className}.setParentCode(null);
+		}
+				<% } %>
 			<% } %>
 		<% } %>
 		List<${ClassName}> list = ${className}Service.findList(${className});
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml
index 282474d3..c544a2c7 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml
@@ -89,9 +89,15 @@ public class ${ClassName}Controller extends BaseController {
 		}
 		<% for(c in table.columnList){ %>
 			<% if(c.isQuery == "1" && !c.isTreeEntityColumn && c.attrName != 'status'){ %>
+				<% if(c.attrType == 'String'){ %>
 		if (StringUtils.isNotBlank(${className}.${c.attrNameForGetMethod})){
 			${className}.setParentCode(null);
 		}
+				<% }else{ %>
+		if (${className}.${c.attrNameForGetMethod} != null){
+			${className}.setParentCode(null);
+		}
+				<% } %>
 			<% } %>
 		<% } %>
 		List<${ClassName}> list = ${className}Service.findList(${className});