From d38a16918ecb21250bb76ff73df8a1bb3a308d6e Mon Sep 17 00:00:00 2001 From: liuyuming Date: Wed, 29 Apr 2020 17:19:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90sql=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.properties | 14 +++++++------- .../src/main/resources/sql/console/user.md | 2 +- .../admin/core/util/beetl/DataAccessFunction.java | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/admin-console/src/main/resources/application.properties b/admin-console/src/main/resources/application.properties index 8ff8f8f8..b7261839 100644 --- a/admin-console/src/main/resources/application.properties +++ b/admin-console/src/main/resources/application.properties @@ -1,20 +1,20 @@ spring.datasource.baseDataSource.url=jdbc:mysql://127.0.0.1:3306/starter?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&useInformationSchema=true spring.datasource.baseDataSource.username=root -spring.datasource.baseDataSource.password=12345678 +spring.datasource.baseDataSource.password=123456 spring.datasource.baseDataSource.driver-class-name=com.mysql.cj.jdbc.Driver beetlsql.ds.baseDataSource.basePackage=com beetlsql.ds.baseDataSource.dbStyle=org.beetl.sql.core.db.MySqlStyle #beetlsql.basePackage=com.ibeetl,com.xxx.yourpackage -#有一个数据源命名为baseDataSource,你可以添加多数据源 +#\u6709\u4E00\u4E2A\u6570\u636E\u6E90\u547D\u540D\u4E3AbaseDataSource,\u4F60\u53EF\u4EE5\u6DFB\u52A0\u591A\u6570\u636E\u6E90 beetlsql.mutiple.datasource=baseDataSource -# 1，1 是管理员密码，相当于启动后就登录，方便测试，系统需要取消这俩个配置 +# 1\uFF0C1 \u662F\u7BA1\u7406\u5458\u5BC6\u7801\uFF0C\u76F8\u5F53\u4E8E\u542F\u52A8\u540E\u5C31\u767B\u5F55\uFF0C\u65B9\u4FBF\u6D4B\u8BD5\uFF0C\u7CFB\u7EDF\u9700\u8981\u53D6\u6D88\u8FD9\u4FE9\u4E2A\u914D\u7F6E user.id=1 user.orgId=1 -#打开审计功能，开发模式应该关闭 +#\u6253\u5F00\u5BA1\u8BA1\u529F\u80FD\uFF0C\u5F00\u53D1\u6A21\u5F0F\u5E94\u8BE5\u5173\u95ED audit.enable=false -#单机情况下使用hashmap存放回话，集群下可以参考springboot 使用redis +#\u5355\u673A\u60C5\u51B5\u4E0B\u4F7F\u7528hashmap\u5B58\u653E\u56DE\u8BDD\uFF0C\u96C6\u7FA4\u4E0B\u53EF\u4EE5\u53C2\u8003springboot \u4F7F\u7528redis spring.session.store-type=HASH_MAP #spring.cache.type= @@ -23,11 +23,11 @@ logging.level.root=info logging.level.org.springframework.web.servlet.mvc.method.annotation=warn #logging.file = my.log server.port=8080 -#html视图交给beetl渲染 +#html\u89C6\u56FE\u4EA4\u7ED9beetl\u6E32\u67D3 beetl.suffix=html app.name=SpringBoot-Plus logging.pattern.console=%-4relative [%thread] %-5level %logger{256} %M %L - %msg%n -#文档预览服务的调用地址，参考https://gitee.com/kekingcn/file-online-preview 安装，没有如下配置无法使用预览功能 +#\u6587\u6863\u9884\u89C8\u670D\u52A1\u7684\u8C03\u7528\u5730\u5740\uFF0C\u53C2\u8003https://gitee.com/kekingcn/file-online-preview \u5B89\u88C5\uFF0C\u6CA1\u6709\u5982\u4E0B\u914D\u7F6E\u65E0\u6CD5\u4F7F\u7528\u9884\u89C8\u529F\u80FD file.previewURL=http://localhost:8012/onlinePreview diff --git a/admin-console/src/main/resources/sql/console/user.md b/admin-console/src/main/resources/sql/console/user.md index e0d0301d..bae8f207 100644 --- a/admin-console/src/main/resources/sql/console/user.md +++ b/admin-console/src/main/resources/sql/console/user.md @@ -8,7 +8,7 @@ queryByCondtion @} from core_user u left join core_org o on u.org_id=o.id where 1=1 and u.del_flag = 0 @//数据权限，该sql语句功能点 - and #function("user.query")# + and #function("user.query",{user:"u.id"})# @if(!isEmpty(orgId)){ and u.org_id =#orgId# @} diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/DataAccessFunction.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/DataAccessFunction.java index fe4ecba5..1b9f1d66 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/DataAccessFunction.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/DataAccessFunction.java @@ -97,7 +97,8 @@ public class DataAccessFunction implements Function { hasAppend = true; DataAccess data = dataAccessFactory.getDataAccess(accessType); DataAccessResullt ret = data.getOrg(user.getId(), currentOrgId); - + + //1 结果仅仅包含用户， 2 ，结果仅仅包含组织机构 3 结果匹配所有组织结构 4 结果不匹配任何组织机构 switch(ret.getStatus()){ case NoneOrg:{ sb.append(targets.get("org")+" in (-1) "); -- Gitee