From caab0040ff15ab84c99681f7e0e36c17bf7c10b7 Mon Sep 17 00:00:00 2001
From: Zhou Mingfa <daxiongren@foxmail.com>
Date: Thu, 22 Feb 2024 11:20:03 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E6=8C=89=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E5=AD=97=E6=9F=A5=E8=AF=A2=E6=97=B6=E7=9A=84SQL=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/business/oa/notice/NoticeDao.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 11a97d6c..df5e9c42 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
@@ -124,7 +124,7 @@
             <if test="query.keywords != null and query.keywords !=''">
                 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})
                 )
             </if>
@@ -182,7 +182,7 @@
             <if test="query.keywords != null and query.keywords !=''">
                 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})
                 )
             </if>

From 28834e2515ac87f75060a469cc2e6a2c6fa253c4 Mon Sep 17 00:00:00 2001
From: Zhou Mingfa <daxiongren@foxmail.com>
Date: Thu, 22 Feb 2024 11:28:18 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0=E6=9C=AA=E8=AF=BB=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=85=AC=E5=91=8A=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/business/oa/notice/NoticeDao.xml   | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

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 df5e9c42..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
         <where>
             <if test="!administratorFlag">
-                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}
-                <if test="requestEmployeeDepartmentIdList != null and requestEmployeeDepartmentIdList.size > 0">
-                    and
-                    t_notice_visible_range.data_id
-                    in
-                    <foreach collection="requestEmployeeDepartmentIdList" open="(" close=")" separator="," item="item">
-                        #{item}
-                    </foreach>
-                </if>
-                )
-                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}
+                        <if test="requestEmployeeDepartmentIdList != null and requestEmployeeDepartmentIdList.size > 0">
+                            and
+                            t_notice_visible_range.data_id
+                            in
+                            <foreach collection="requestEmployeeDepartmentIdList" open="(" close=")" separator="," item="item">
+                                #{item}
+                            </foreach>
+                        </if>
+                        )
+                        or ( t_notice_visible_range.data_type = #{employeeDataType} and t_notice_visible_range.data_id = #{requestEmployeeId} )
+                    )
+                    or t_notice.all_visible_flag = true
                 )
             </if>
             and t_notice.all_visible_flag = true

From 18c1ac5a5b054094ebfd58a66c80284ac7ecb267 Mon Sep 17 00:00:00 2001
From: Zhou Mingfa <daxiongren@foxmail.com>
Date: Thu, 22 Feb 2024 15:54:51 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4=E6=B3=A8=E8=A7=A3=20?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/support/repeatsubmit/RepeatSubmitAspect.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/RepeatSubmitAspect.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/RepeatSubmitAspect.java
index af403c64..55ac6f2c 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/RepeatSubmitAspect.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/RepeatSubmitAspect.java
@@ -61,12 +61,14 @@ public class RepeatSubmitAspect {
             RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class);
 
             // 说明注解去掉了
-            if (annotation != null) {
+            if (annotation == null) {
                 return point.proceed();
             }
 
             int interval = Math.min(annotation.value(), RepeatSubmit.MAX_INTERVAL);
             if (System.currentTimeMillis() < timeStamp + interval) {
+                // 续上时间 能在间隔时间内反复提示用户提交频繁
+                this.repeatSubmitTicket.putTicket(ticket);
                 // 提交频繁
                 return ResponseDTO.error(UserErrorCode.REPEAT_SUBMIT);
             }
@@ -80,8 +82,6 @@ public class RepeatSubmitAspect {
         } catch (Throwable throwable) {
             log.error("", throwable);
             throw throwable;
-        } finally {
-            this.repeatSubmitTicket.removeTicket(ticket);
         }
         return obj;
     }

From 1812cb3d6bfea392d027f6e33547b658bb65fc9b Mon Sep 17 00:00:00 2001
From: Zhou Mingfa <daxiongren@foxmail.com>
Date: Thu, 22 Feb 2024 17:26:19 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=9A=E8=A7=A3=E5=86=B3=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=81=E6=94=AF=E6=8C=81=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E3=80=81=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=B6=85=E5=87=BA=E6=96=87=E4=BB=B6=E6=9C=80=E5=A4=A7=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E4=B8=8E=E8=B6=85=E5=87=BA=E5=8D=95=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E7=9B=B8=E5=BA=94=E7=9A=84=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/support/file-api.js               |  2 +-
 .../components/support/file-upload/index.vue  | 40 ++++++++++++++++---
 2 files changed, 36 insertions(+), 6 deletions(-)

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 @@
 <template>
   <div class="clearfix">
     <a-upload
+      multiple
       :accept="props.accept"
       :before-upload="beforeUpload"
       :customRequest="customRequest"
@@ -43,12 +44,11 @@
 </template>
 <script setup>
   import { computed, ref, watch } from 'vue';
-  import { message } from 'ant-design-vue';
+  import { Modal } from 'ant-design-vue';
   import { fileApi } from '/src/api/support/file-api';
   import { useUserStore } from '/@/store/modules/system/user';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';
-  import { getDownload } from '/@/lib/axios';
   import { smartSentry } from '/@/lib/smart-sentry';
   const props = defineProps({
     value: String,
@@ -162,14 +162,44 @@
     console.log(fileList.value);
   }
 
-  function beforeUpload(file) {
+  function beforeUpload(file, files) {
+    if (fileList.value.length + files.length > props.maxUploadSize) {
+      showErrorMsgOnce(`最多支持上传 ${props.maxUploadSize} 个文件哦！`);
+      return false;
+    }
+
+    if (props.accept) {
+      const suffixIndex = file.name.lastIndexOf('.');
+      const fileSuffix = file.name.substring(suffixIndex <= -1 ? 0 : suffixIndex);
+      if (props.accept.indexOf(fileSuffix) === -1) {
+        showErrorMsgOnce(`只支持上传 ${props.accept.replaceAll(',', ' ')} 格式的文件`);
+        return false;
+      }
+    }
+
     const isLimitSize = file.size / 1024 / 1024 < props.maxSize;
     if (!isLimitSize) {
-      return message.error(`上传的文件必须小于${props.maxSize}Mb`);
+      showErrorMsgOnce(`单个文件大小必须小于 ${props.maxSize} Mb`);
     }
     return isLimitSize;
   }
 
+  const showErrorModalFlag = ref(true);
+  const showErrorMsgOnce = (content) => {
+    if (showErrorModalFlag.value) {
+      Modal.error({
+        title: '提示',
+        content: content,
+        okType: 'danger',
+        centered: true,
+        onOk() {
+          showErrorModalFlag.value = true;
+        },
+      });
+      showErrorModalFlag.value = false;
+    }
+  };
+
   function handleCancel() {
     previewVisible.value = false;
   }
@@ -179,7 +209,7 @@
       previewUrl.value = file.url || file.preview;
       previewVisible.value = true;
     } else {
-      getDownload(file.fileName, file.fileUrl);
+      fileApi.downLoadFile(file.fileKey);
     }
   };
 

From 47dd346f1428f24ec9ef30bb800b8db2380530c2 Mon Sep 17 00:00:00 2001
From: Zhou Mingfa <daxiongren@foxmail.com>
Date: Fri, 23 Feb 2024 09:51:17 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sa/admin/module/system/login/service/LoginService.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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);

From e1f5b5ca12fe58cf5240783773b16ce5aa6bd64b Mon Sep 17 00:00:00 2001
From: Zhou Mingfa <daxiongren@foxmail.com>
Date: Fri, 23 Feb 2024 09:55:28 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97=E7=9A=84=20modal=20?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=E7=82=B9=E5=87=BB=E5=8F=B3=E4=B8=8A?=
 =?UTF-8?q?=E8=A7=92=E7=9A=84=E5=8F=89=E4=B8=8D=E8=83=BD=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/support/change-log/change-log-modal.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/change-log/change-log-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/change-log/change-log-modal.vue
index 45e9d8c7..477c20eb 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/change-log/change-log-modal.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/change-log/change-log-modal.vue
@@ -6,7 +6,7 @@
   * @Copyright  1024创新实验室
 -->
 <template>
-  <a-modal title="更新日志" width="700px" :open="visibleFlag" @close="onClose" >
+  <a-modal title="更新日志" width="700px" :open="visibleFlag" @cancel="onClose" >
 
     <div>
       <pre>{{ content }}</pre>