bug fix

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

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.ibeetl</groupId>
     <artifactId>admin-cloud</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
   </parent>
   <artifactId>admin-cloud-eureka-server</artifactId>
   <name>admin-cloud-eureka-server</name>

admin-cloud/pom.xml

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

admin-console/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.ibeetl</groupId>
 		<artifactId>admin-cloud</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2</version>
 	</parent>
 	<dependencies>
 		<dependency>

admin-console/src/main/resources/templates/admin/function/add.html

@@ -20,7 +20,7 @@
 		<div class="layui-form-item">
 			<label class="layui-form-label">功能地址</label>
 			<div class="layui-input-inline">
-				<input type="text" name="accessUrl"  lay-verify="required"
+				<input type="text" name="accessUrl" 
 					placeholder="请输入" autocomplete="off" class="layui-input"
 					value="">
 			</div>

admin-console/src/main/resources/templates/admin/function/edit.html

@@ -20,7 +20,7 @@
 		<div class="layui-form-item">
 			<label class="layui-form-label">功能地址</label>
 			<div class="layui-input-inline">
-				<input type="text" name="accessUrl"  lay-verify="required"
+				<input type="text" name="accessUrl"  
 					placeholder="请输入" autocomplete="off" class="layui-input"
 					value="${function.accessUrl}">
 			</div>

admin-core/pom.xml

@@ -96,7 +96,7 @@
     <parent>
         <groupId>com.ibeetl</groupId>
         <artifactId>admin</artifactId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
     </parent>
 
   

admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/DataAccessFunction.java

@@ -101,6 +101,7 @@ public class DataAccessFunction implements Function {
 			switch(ret.getStatus()){
 			case NoneOrg:{
 				sb.append(targets.get("org")+" in (-1) ");
+				break;
 			}
 			case AllOrg:{
 				//sql 不包含组织机构过滤信息
@@ -128,6 +129,7 @@ public class DataAccessFunction implements Function {
 					}
 				}
 				sb.append(") ");
+				break;
 			
 			}
 			case OnlyOrg:{
@@ -152,6 +154,7 @@ public class DataAccessFunction implements Function {
 					}
 				}
 				sb.append(") ");
+				break;
 			}
 			default:{
 				log.warn("错误的"+ret.getStatus().toString());
@@ -166,32 +169,7 @@ public class DataAccessFunction implements Function {
 		return sb.toString();
 	}
 	
-	private String appendAlias(String alias,String sql){
-		if(alias==null){
-			return sql;
-		}
-		
-		return " " +alias+"."+sql;
-	}
-	
-	private void buildSqlIn(List<Long> list,List<Object> paras,Map targets,StringBuilder sql){
-		if(list.isEmpty()){
-			//如果没有满足条件的部门
-			sql.append(targets.get("org")+" in (-1)");
-		}
 
-		sql.append(targets.get("org")+" in (");
-		for(int i=0;i<list.size();i++){
-			sql.append("?");
-			if(i!=list.size()-1){
-				sql.append(",");
-			}
-			paras.add(new SQLParameter(list.get(i)));
-			
-		}
-		
-		sql.append(")");
-	}
 	
 	
 }

admin-workflow/pom.xml

@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.ibeetl</groupId>
 		<artifactId>admin-cloud</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2</version>
 		</parent>
 	<dependencies>
 		<dependency>

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ibeetl</groupId>
 	<artifactId>admin</artifactId>
-	<version>1.1.1</version>
+	<version>1.1.2</version>
 	<packaging>pom</packaging>
 	<properties>
 		<java.version>1.8</java.version>
@@ -11,8 +11,8 @@
 	</properties>
 	<modules>
 		<module>admin-core</module>
-		<module>admin-console</module>
 		<module>admin-cloud</module>
+		<module>admin-console</module>
 		<module>admin-workflow</module>
 	</modules>
 	<parent>