1.1.3

admin-cloud/admin-cloud-eureka-server/pom.xml

@@ -3,7 +3,8 @@
   <parent>
     <groupId>com.ibeetl</groupId>
     <artifactId>admin-cloud</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>admin-cloud-eureka-server</artifactId>
   <name>admin-cloud-eureka-server</name>

admin-cloud/pom.xml

@@ -5,7 +5,8 @@
 	<parent>
 		<groupId>com.ibeetl</groupId>
 		<artifactId>admin</artifactId>
-		<version>1.1.2</version>
+		<version>1.1.3</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>admin-cloud</artifactId>
 	<packaging>pom</packaging>

admin-console/pom.xml

@@ -6,7 +6,8 @@
 	<parent>
 		<groupId>com.ibeetl</groupId>
 		<artifactId>admin-cloud</artifactId>
-		<version>1.1.2</version>
+		<version>1.1.3</version>
+		<relativePath>../admin-cloud/pom.xml</relativePath>
 	</parent>
 	<dependencies>
 		<dependency>

admin-core/pom.xml

@@ -96,7 +96,8 @@
     <parent>
         <groupId>com.ibeetl</groupId>
         <artifactId>admin</artifactId>
-        <version>1.1.2</version>
+        <version>1.1.3</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
   

admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.beetl.sql.core.JavaType;
@@ -218,7 +219,7 @@ public class CoreCodeGenService {
 	/*根据数据库注释来判断显示名称*/
 	private void setGetDisplayName(Attribute attr) {
 		String comment = attr.getComment();
-		if(comment==null) {
+		if(StringUtils.isEmpty(comment)) {
 			attr.setDisplayName(attr.getName());
 			return ;
 		}

admin-core/src/main/java/com/ibeetl/admin/core/web/CoreCodeGenController.java

@@ -289,6 +289,7 @@ public class CoreCodeGenController {
 			content.put(gen.getName(), code);
 		}
 		
+		
 		return JsonResult.success(content);
 
 	}

admin-core/src/main/resources/codeTemplate/maven/pomTemplate.xml

@@ -12,19 +12,19 @@
 	<parent>
 		<groupId>com.ibeetl</groupId>
 		<artifactId>admin-cloud</artifactId>
-		<version>1.1.2</version>
+		<version>1.1.3</version>
 	</parent>
 	<dependencies>
 		<dependency>
 			<groupId>com.ibeetl</groupId>
 			<artifactId>admin-core</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.3</version>
 		</dependency>
 		<!--  admin-console 包含了系统管理管理的所有功能，子系统可以不使用这部分 -->
 		<dependency>
 			<groupId>com.ibeetl</groupId>
 			<artifactId>admin-console</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.3</version>
 		</dependency>
 
 		<dependency>

admin-core/src/main/resources/codeTemplate/md/entity.md

@@ -9,7 +9,7 @@ queryByCondition
     from ${entity.tableName} t
     where del_flag=0 
     \@//数据权限，该sql语句功能点  
-    #function("${entity.code}.query")#
+    and #function("${entity.code}.query")#
     @for(attr in entity.list){
     		@if(attr.showInQuery){
     \@if(!isEmpty(${attr.name})){

admin-workflow/pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.ibeetl</groupId>
 	<artifactId>admin-workflow</artifactId>
-	<version>1.1.1</version>
+	<version>1.1.3</version>
 	<packaging>jar</packaging>
 
 	<name>workflow</name>
@@ -19,8 +19,9 @@
 	<parent>
 		<groupId>com.ibeetl</groupId>
 		<artifactId>admin-cloud</artifactId>
-		<version>1.1.2</version>
-		</parent>
+		<version>1.1.3</version>
+		<relativePath>../admin-cloud/pom.xml</relativePath>
+	</parent>
 	<dependencies>
 		<dependency>
 		    <groupId>org.flowable</groupId>

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ibeetl</groupId>
 	<artifactId>admin</artifactId>
-	<version>1.1.2</version>
+	<version>1.1.3</version>
 	<packaging>pom</packaging>
 	<properties>
 		<java.version>1.8</java.version>