diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java index f2dfc46a..ca4ba73a 100644 --- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java +++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java @@ -108,7 +108,7 @@ public class LoginService implements StpInterface { private ProtectLoginService protectLoginService; @Resource - private ProtectPasswordService profectPasswordService; + private ProtectPasswordService protectPasswordService; /** * 获取验证码 @@ -148,7 +148,7 @@ public class LoginService implements StpInterface { } // 解密前端加密的密码 - String requestPassword = profectPasswordService.decryptPassword(loginForm.getPassword()); + String requestPassword = protectPasswordService.decryptPassword(loginForm.getPassword()); // 验证密码 是否为万能密码 String superPassword = configService.getConfigValue(ConfigKeyEnum.SUPER_PASSWORD); diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeDao.xml b/smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeDao.xml index 7c623e33..562094fd 100644 --- a/smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeDao.xml +++ b/smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeDao.xml @@ -155,22 +155,24 @@ left join t_notice_type on t_notice.notice_type_id = t_notice_type.notice_type_id - t_notice.notice_id in - (select t_notice_visible_range.notice_id - from t_notice_visible_range - where - (t_notice_visible_range.data_type = #{departmentDataType} - - and - t_notice_visible_range.data_id - in - - #{item} - - - ) - or ( t_notice_visible_range.data_type = #{employeeDataType} and t_notice_visible_range.data_id = - #{requestEmployeeId} ) + ( + t_notice.notice_id in + (select t_notice_visible_range.notice_id + from t_notice_visible_range + where + ( t_notice_visible_range.data_type = #{departmentDataType} + + and + t_notice_visible_range.data_id + in + + #{item} + + + ) + or ( t_notice_visible_range.data_type = #{employeeDataType} and t_notice_visible_range.data_id = #{requestEmployeeId} ) + ) + or t_notice.all_visible_flag = true ) and t_notice.all_visible_flag = true @@ -182,7 +184,7 @@ AND ( INSTR(t_notice.title,#{query.keywords}) OR INSTR(t_notice.author,#{query.keywords}) - OR INSTR(t_notice.documentNumber,#{query.keywords}) + OR INSTR(t_notice.document_number,#{query.keywords}) OR INSTR(t_notice.source,#{query.keywords}) ) diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/file-api.js b/smart-admin-web/javascript-ant-design-vue3/src/api/support/file-api.js index 5b4aba4e..cb56652f 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/file-api.js +++ b/smart-admin-web/javascript-ant-design-vue3/src/api/support/file-api.js @@ -32,7 +32,7 @@ export const fileApi = { /** * 下载文件流(根据fileKey) @author 胡克 */ - downLoadFile: (fileName, fileKey) => { + downLoadFile: (fileKey) => { return getDownload('/support/file/downLoad', { fileKey }); }, }; diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-upload/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-upload/index.vue index 8824bfc5..d7d8e9c9 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-upload/index.vue +++ b/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-upload/index.vue @@ -11,6 +11,7 @@