From 31c9b9a01d4b13f851861887036a3877ba804e13 Mon Sep 17 00:00:00 2001 From: ZhengJie <201507802@qq.com> Date: Sun, 2 Aug 2020 15:52:33 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84](v2.5):?= =?UTF-8?q?=20=E9=83=A8=E9=97=A8=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit close https://github.com/elunez/eladmin/issues/428 --- .../zhengjie/modules/system/service/impl/DeptServiceImpl.java | 2 +- eladmin-system/src/main/resources/config/application-dev.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java index b56877b6..82969086 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java @@ -64,7 +64,7 @@ public class DeptServiceImpl implements DeptService { if(dataScopeType.equals(DataScopeEnum.ALL.getValue())){ criteria.setPidIsNull(true); } - List fields = QueryHelp.getAllFields(criteria.getClass(), new ArrayList<>()); + List fields = QueryHelp.getAllFields(criteria.getClass()); List fieldNames = new ArrayList(){{ add("pidIsNull");add("enabled");}}; for (Field field : fields) { //设置对象的访问权限，保证对private的属性的访问 diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml index 64067dcf..bd2b1ec6 100644 --- a/eladmin-system/src/main/resources/config/application-dev.yml +++ b/eladmin-system/src/main/resources/config/application-dev.yml @@ -6,7 +6,7 @@ spring: driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy url: jdbc:log4jdbc:mysql://localhost:3306/eladmin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false username: root - password: 59421 + password: 123456 # 初始连接数 initial-size: 5 # 最小连接数