xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-09-20 04:16:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v1.2.1

Browse Source
This commit is contained in:
zhuoda 2020-09-22 09:33:56 +08:00
parent 8f32765f44
commit 70173ebd22
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/dao/NoticeDao.java
View File

@ -41,7 +41,7 @@ public interface NoticeDao extends BaseMapper<NoticeEntity> {
* @param employeeId * @param employeeId
* @return * @return
*/ */
@DataScope(joinSql = "n.create_user_department_id in (#departmentIds)", whereInType = DataScopeWhereInTypeEnum.DEPARTMENT) @DataScope(joinSql = "e.department_id in (#departmentIds)", whereInType = DataScopeWhereInTypeEnum.DEPARTMENT)
List<NoticeVO> queryUnreadByPage(Page page, @Param("employeeId") Long employeeId, @Param("sendStatus") Integer sendStatus); List<NoticeVO> queryUnreadByPage(Page page, @Param("employeeId") Long employeeId, @Param("sendStatus") Integer sendStatus);

2
smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
View File

@ -28,7 +28,7 @@ spring.datasource.username=smart-admin
spring.datasource.password=Admin@123457 spring.datasource.password=Admin@123457
spring.datasource.initial-size=2 spring.datasource.initial-size=2
spring.datasource.min-idle=1 spring.datasource.min-idle=1
spring.datasource.max-active=10 spring.datasource.max-active=100
spring.datasource.max-wait=60000 spring.datasource.max-wait=60000
spring.datasource.time-between-eviction-runs-millis=60000 spring.datasource.time-between-eviction-runs-millis=60000
spring.datasource.min-evictable-idle-time-millis=300000 spring.datasource.min-evictable-idle-time-millis=300000

4
smart-admin-web/.env.development
View File

@ -1,4 +1,4 @@
NODE_ENV=development NODE_ENV=development
VUE_APP_TYPE=dev VUE_APP_TYPE=dev
VUE_APP_URL=http://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://172.16.0.145:10086/smart-admin-api/ VUE_APP_SOCKET_URL=ws://127.0.0.1:10086/smart-admin-api/

1
smart-admin-web/src/views/business/email/send-mail.vue
View File

@ -94,6 +94,7 @@ export default {
let g = this; let g = this;
g.editor = new WangEditor('#editor'); g.editor = new WangEditor('#editor');
g.editor.customConfig = { g.editor.customConfig = {
zIndex:1,
// 功能键 // 功能键
menus: [ menus: [
'head', // 标题 'head', // 标题