From 70173ebd221544857d3e41729d1a6d9ddf6f09a6 Mon Sep 17 00:00:00 2001 From: zhuoda Date: Tue, 22 Sep 2020 09:33:56 +0800 Subject: [PATCH] v1.2.1 --- .../smartadmin/module/business/notice/dao/NoticeDao.java | 2 +- .../src/main/resources/prod/application.properties | 2 +- smart-admin-web/.env.development | 4 ++-- smart-admin-web/src/views/business/email/send-mail.vue | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/dao/NoticeDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/dao/NoticeDao.java index 9e07e2ea..de7caec5 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/dao/NoticeDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/dao/NoticeDao.java @@ -41,7 +41,7 @@ public interface NoticeDao extends BaseMapper { * @param employeeId * @return */ - @DataScope(joinSql = "n.create_user_department_id in (#departmentIds)", whereInType = DataScopeWhereInTypeEnum.DEPARTMENT) + @DataScope(joinSql = "e.department_id in (#departmentIds)", whereInType = DataScopeWhereInTypeEnum.DEPARTMENT) List queryUnreadByPage(Page page, @Param("employeeId") Long employeeId, @Param("sendStatus") Integer sendStatus); diff --git a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties index 7acf99ef..70db1f5a 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties +++ b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties @@ -28,7 +28,7 @@ spring.datasource.username=smart-admin spring.datasource.password=Admin@123457 spring.datasource.initial-size=2 spring.datasource.min-idle=1 -spring.datasource.max-active=10 +spring.datasource.max-active=100 spring.datasource.max-wait=60000 spring.datasource.time-between-eviction-runs-millis=60000 spring.datasource.min-evictable-idle-time-millis=300000 diff --git a/smart-admin-web/.env.development b/smart-admin-web/.env.development index 7c1979f5..746c33a9 100644 --- a/smart-admin-web/.env.development +++ b/smart-admin-web/.env.development @@ -1,4 +1,4 @@ NODE_ENV=development VUE_APP_TYPE=dev -VUE_APP_URL=http://172.16.0.145:10086/smart-admin-api/ -VUE_APP_SOCKET_URL=ws://172.16.0.145:10086/smart-admin-api/ +VUE_APP_URL=http://127.0.0.1:10086/smart-admin-api/ +VUE_APP_SOCKET_URL=ws://127.0.0.1:10086/smart-admin-api/ diff --git a/smart-admin-web/src/views/business/email/send-mail.vue b/smart-admin-web/src/views/business/email/send-mail.vue index ae4bb47e..d06261d9 100644 --- a/smart-admin-web/src/views/business/email/send-mail.vue +++ b/smart-admin-web/src/views/business/email/send-mail.vue @@ -94,6 +94,7 @@ export default { let g = this; g.editor = new WangEditor('#editor'); g.editor.customConfig = { + zIndex:1, // 功能键 menus: [ 'head', // 标题