From b8939ebd35f38b1913e9f671849e18e108b186ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BF=99=E7=A2=8C=E8=98=91=E8=8F=87?= Date: Wed, 10 Apr 2019 10:35:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-console/pom.xml | 54 ++--- .../src/main/resources/application.properties | 2 +- admin-core/pom.xml | 206 +++++++++--------- 3 files changed, 131 insertions(+), 131 deletions(-) diff --git a/admin-console/pom.xml b/admin-console/pom.xml index 99ee2bf0..1a606b9b 100644 --- a/admin-console/pom.xml +++ b/admin-console/pom.xml @@ -1,27 +1,27 @@ - - 4.0.0 - admin-console - jar - - com.ibeetl - admin - ${plus.version} - ../pom.xml - - - - com.ibeetl - admin-core - ${plus.version} - - - - - mysql - mysql-connector-java - 6.0.5 - - - - + + 4.0.0 + admin-console + jar + + com.ibeetl + admin + ${plus.version} + ../pom.xml + + + + com.ibeetl + admin-core + ${plus.version} + + + + + mysql + mysql-connector-java + 8.0.13 + + + + diff --git a/admin-console/src/main/resources/application.properties b/admin-console/src/main/resources/application.properties index 29ae7b75..32db99a0 100644 --- a/admin-console/src/main/resources/application.properties +++ b/admin-console/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/starter?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&useInformationSchema=true +spring.datasource.url=jdbc:mysql://2.1.1.3:3306/starter?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&useInformationSchema=true spring.datasource.username=root spring.datasource.password=123456 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/admin-core/pom.xml b/admin-core/pom.xml index 7fbef3b6..abb22029 100644 --- a/admin-core/pom.xml +++ b/admin-core/pom.xml @@ -1,103 +1,103 @@ - - 4.0.0 - admin-core - jar - - com.ibeetl - admin - ${plus.version} - ../pom.xml - - - true - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.springframework.boot - spring-boot-starter-aop - - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-data-redis - - - - - com.ibeetl - beetl-framework-starter - 1.1.68.RELEASE - - - - com.zaxxer - HikariCP - - - mysql - mysql-connector-java - 6.0.5 - - - - - org.jxls - jxls-reader - 2.0.3 - - - - org.jxls - jxls - 2.4.3 - - - org.jxls - jxls-poi - 1.0.14 - - - org.apache.commons - commons-lang3 - 3.3.2 - - - - org.apache.poi - poi - 3.17 - - - org.apache.poi - poi-ooxml - 3.17 - - - - - - - - + + 4.0.0 + admin-core + jar + + com.ibeetl + admin + ${plus.version} + ../pom.xml + + + true + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.springframework.boot + spring-boot-starter-aop + + + + org.springframework.boot + spring-boot-starter-cache + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + com.ibeetl + beetl-framework-starter + 1.1.68.RELEASE + + + + com.zaxxer + HikariCP + + + mysql + mysql-connector-java + 8.0.13 + + + + + org.jxls + jxls-reader + 2.0.3 + + + + org.jxls + jxls + 2.4.3 + + + org.jxls + jxls-poi + 1.0.14 + + + org.apache.commons + commons-lang3 + 3.3.2 + + + + org.apache.poi + poi + 3.17 + + + org.apache.poi + poi-ooxml + 3.17 + + + + + + + + -- Gitee From 87e722dfdad17d8d1ffb9e4b92f58b1566c510e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BF=99=E7=A2=8C=E8=98=91=E8=8F=87?= Date: Wed, 17 Apr 2019 10:10:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E2=80=9C=E9=83=A8=E9=97=A8=E5=8F=8A=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E4=B8=8B=E6=89=80=E6=9C=89=E2=80=9D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/core/rbac/da/SameDeparmentAllDataAccess.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/rbac/da/SameDeparmentAllDataAccess.java b/admin-core/src/main/java/com/ibeetl/admin/core/rbac/da/SameDeparmentAllDataAccess.java index ebf7149e..a2d2f700 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/rbac/da/SameDeparmentAllDataAccess.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/rbac/da/SameDeparmentAllDataAccess.java @@ -30,13 +30,12 @@ public class SameDeparmentAllDataAccess implements DataAccess { DataAccessResullt ret = new DataAccessResullt(); ret.setStatus(AccessType.OnlyOrg); OrgItem item = platformService.getCurrentOrgItem(); - OrgItem dept = item.findParentOrgItem(DefaultDataAccessFactory.DEPARTMENT_TYPE); - if(dept==null){ + if(item==null){ ret.setOrgIds(Collections.EMPTY_LIST); return ret; } - List all = dept.findAllChildOrgItem(null); - all.add(dept); + List all = item.findAllChildOrgItem(null); + all.add(item); List list = new ArrayList(all.size()); for(OrgItem org:all){ list.add(org.getId()); -- Gitee