From 36e554d8edecc76cb68cccb6b5e4d1d81266639f Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Wed, 24 Jul 2024 20:42:33 +0800
Subject: [PATCH 01/22] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E6=8A=A5=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/support/file/file-list.vue                      | 2 +-
 .../src/api/support/file/file-api.js                          | 4 ++--
 .../src/views/support/file/file-list.vue                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/file/file-list.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/file/file-list.vue
index 3758eeaa..5adeafd4 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/file/file-list.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/file/file-list.vue
@@ -270,7 +270,7 @@
   // 下载文件
   async function download(file) {
     try {
-      await fileApi.downLoadFile(file.fileName, file.fileKey);
+      await fileApi.downLoadFile(file.fileKey);
     } catch (e) {
       smartSentry.captureError(e);
     }
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/file/file-api.js b/smart-admin-web/typescript-ant-design-vue3/src/api/support/file/file-api.js
index ec001f2a..2e470933 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/support/file/file-api.js
+++ b/smart-admin-web/typescript-ant-design-vue3/src/api/support/file/file-api.js
@@ -32,7 +32,7 @@ export const fileApi = {
   /**
    * 下载文件流（根据fileKey） @author 胡克
    */
-  downLoadFile: (fileName, fileKey) => {
-    return getDownload(fileName, '/support/file/downLoad', { fileKey });
+  downLoadFile: (fileKey) => {
+    return getDownload('/support/file/downLoad', { fileKey });
   },
 };
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/file/file-list.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/support/file/file-list.vue
index 15c6cd7a..bf989daa 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/file/file-list.vue
+++ b/smart-admin-web/typescript-ant-design-vue3/src/views/support/file/file-list.vue
@@ -270,7 +270,7 @@ function view(file) {
 // 下载文件
 async function download(file) {
   try {
-    await fileApi.downLoadFile(file.fileName, file.fileKey);
+    await fileApi.downLoadFile(file.fileKey);
   } catch (e) {
     smartSentry.captureError(e);
   }

From 6f3d7dc3a2157e46924e3b12a4f665de10af4bb4 Mon Sep 17 00:00:00 2001
From: C-ccc <2170639886@qq.com>
Date: Thu, 25 Jul 2024 08:36:58 +0000
Subject: [PATCH 02/22] =?UTF-8?q?update=20system/department/manager/Depart?=
 =?UTF-8?q?mentCacheManager.java.=20=E4=BF=AE=E6=94=B9=20recursiveBuildTre?=
 =?UTF-8?q?e=E6=96=B9=E6=B3=95=EF=BC=8C=E4=BD=BF=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=80=BC=E4=B8=AD=E7=9A=84setSelfAndAllChildrenIdList=E6=98=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=BD=93=E5=89=8D=E8=8A=82=E7=82=B9=E4=B8=BA=E6=A0=B9?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=9A=84=E5=B1=82=E5=BA=8F=E9=81=8D=E5=8E=86?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: C-ccc <2170639886@qq.com>
---
 .../manager/DepartmentCacheManager.java       | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
index 3ed6f350..5a4ecc4d 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
@@ -141,13 +141,15 @@ public class DepartmentCacheManager {
         return treeVOList;
     }
 
-    /**
+     /**
      * 构建所有根节点的下级树形结构
-     *
+     * 返回值为层序遍历结果 
+     * [由于departmentDao中listAll给出数据根据Sort降序 所以同一层中Sort值较大的优先遍历]
      */
-    private void recursiveBuildTree(List<DepartmentTreeVO> nodeList, List<DepartmentVO> allDepartmentList) {
+    private List<Long> recursiveBuildTree(List<DepartmentTreeVO> nodeList, List<DepartmentVO> allDepartmentList) {
         int nodeSize = nodeList.size();
-        for (int i = 0; i < nodeSize; i++) {
+        List<Long> childIdList = new ArrayList<>();
+        for(int i = 0; i < nodeSize; i++) {
             int preIndex = i - 1;
             int nextIndex = i + 1;
             DepartmentTreeVO node = nodeList.get(i);
@@ -158,16 +160,34 @@ public class DepartmentCacheManager {
                 node.setNextId(nodeList.get(nextIndex).getDepartmentId());
             }
 
-            ArrayList<Long> selfAndAllChildrenIdList = Lists.newArrayList();
-            selfAndAllChildrenIdList.add(node.getDepartmentId());
-            node.setSelfAndAllChildrenIdList(selfAndAllChildrenIdList);
-
             List<DepartmentTreeVO> children = getChildren(node.getDepartmentId(), allDepartmentList);
+            
+            List<Long> tempChildIdList = new ArrayList<>();
             if (CollectionUtils.isNotEmpty(children)) {
                 node.setChildren(children);
-                this.recursiveBuildTree(children, allDepartmentList);
+                tempChildIdList = this.recursiveBuildTree(children, allDepartmentList);
             }
+
+            if(CollectionUtils.isEmpty(node.getSelfAndAllChildrenIdList())) {
+                node.setSelfAndAllChildrenIdList(
+                        new ArrayList<>()
+                );
+            }
+            node.getSelfAndAllChildrenIdList().add(node.getDepartmentId());
+            
+            if(CollectionUtils.isNotEmpty(tempChildIdList)) {
+                node.getSelfAndAllChildrenIdList().addAll(tempChildIdList);
+                childIdList.addAll(tempChildIdList);
+            }
+            
         }
+        
+        // 保证本层遍历顺序
+        for(int i = nodeSize - 1; i >= 0; i--) {
+            childIdList.add(0, nodeList.get(i).getDepartmentId());
+        }
+        
+        return childIdList;
     }
 
 

From 2f5683ac9df904365fea388d7b8d84571ff6123e Mon Sep 17 00:00:00 2001
From: LiZongLiang <lzl_anonym@aliyun.com>
Date: Sat, 3 Aug 2024 16:13:21 +0800
Subject: [PATCH 03/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/department/service/DepartmentService.java     | 2 +-
 .../sa/admin/module/system/employee/dao/EmployeeDao.java        | 2 +-
 .../main/resources/mapper/system/employee/EmployeeMapper.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
index 7b58bca2..dade9aaa 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
@@ -92,7 +92,7 @@ public class DepartmentService {
         }
 
         // 是否有未删除员工
-        int employeeNum = employeeDao.countByDepartmentId(departmentId);
+        int employeeNum = employeeDao.countByDepartmentId(departmentId, Boolean.FALSE);
         if (employeeNum > 0) {
             return ResponseDTO.userErrorParam("请先删除部门员工");
         }
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/dao/EmployeeDao.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/dao/EmployeeDao.java
index c9126970..c1297a84 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/dao/EmployeeDao.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/dao/EmployeeDao.java
@@ -69,7 +69,7 @@ public interface EmployeeDao extends BaseMapper<EmployeeEntity> {
      * 获取某个部门员工数
      *
      */
-    Integer countByDepartmentId(@Param("departmentId") Long departmentId);
+    Integer countByDepartmentId(@Param("departmentId") Long departmentId, @Param("deletedFlag") Boolean deletedFlag);
 
     /**
      * 获取一批员工
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml b/smart-admin-api/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
index 24f5eebb..506c6832 100644
--- a/smart-admin-api/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
+++ b/smart-admin-api/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
@@ -85,7 +85,7 @@
     <select id="countByDepartmentId" resultType="integer">
         SELECT count(1) FROM t_employee
         WHERE
-        department_id = #{departmentId}
+        department_id = #{departmentId} AND deleted_flag = #{deletedFlag}
     </select>
 
 

From 7d8879abcb872d8f1c5328043a2d9bc7c71c30c1 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sat, 3 Aug 2024 22:40:53 +0800
Subject: [PATCH 04/22] =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E4=B8=BA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0=E4=B8=AD=E6=B7=BB=E5=8A=A0=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=9F=A5=E8=AF=A2=E6=80=BB=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/net/lab1024/sa/base/common/util/SmartPageUtil.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartPageUtil.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartPageUtil.java
index 4e2f24c0..9dca8487 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartPageUtil.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartPageUtil.java
@@ -12,7 +12,6 @@ import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 分页工具类
@@ -32,6 +31,10 @@ public class SmartPageUtil {
     public static Page<?> convert2PageQuery(PageParam pageParam) {
         Page<?> page = new Page<>(pageParam.getPageNum(), pageParam.getPageSize());
 
+        if (pageParam.getSearchCount() != null) {
+            page.setSearchCount(pageParam.getSearchCount());
+        }
+
         List<PageParam.SortItem> sortItemList = pageParam.getSortItemList();
         if (CollectionUtils.isEmpty(sortItemList)) {
             return page;

From 694aa184527940f8abf3019857619acfeeb2d7f5 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sat, 3 Aug 2024 23:38:05 +0800
Subject: [PATCH 05/22] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E5=BE=85=E5=8A=9E=E5=8D=A1=E7=89=87=E4=B8=AD=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=9F=BA=E4=BA=8ElocalStorage=E7=9A=84=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E6=B7=BB=E5=8A=A0=E4=B8=8E=E5=88=A0=E9=99=A4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=B9=B6=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E7=9A=84=E6=B6=88=E6=81=AF=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/constants/local-storage-key-const.js  |   2 +
 .../header-user-space/header-avatar.vue       |   2 -
 .../header-user-space/header-message.vue      |  76 +++++++-
 .../components/header-user-space/index.vue    |   4 +-
 .../src/lib/axios.js                          |   5 +-
 .../src/router/index.js                       |   4 +-
 .../src/store/modules/system/user.js          |  24 ++-
 .../src/utils/local-util.js                   |   4 +
 .../account/components/message/index.vue      |   2 +-
 .../home/components/to-be-done-card.vue       | 158 ----------------
 .../to-be-done-card/home-to-be-done.vue       | 172 ++++++++++++++++++
 .../to-be-done-card/to-be-done-modal.vue      |  63 +++++++
 .../src/views/system/home/index.vue           |   2 +-
 13 files changed, 337 insertions(+), 181 deletions(-)
 delete mode 100644 smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card.vue
 create mode 100644 smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/home-to-be-done.vue
 create mode 100644 smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/local-storage-key-const.js b/smart-admin-web/javascript-ant-design-vue3/src/constants/local-storage-key-const.js
index 384c6e74..98ece9a1 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/constants/local-storage-key-const.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/constants/local-storage-key-const.js
@@ -30,4 +30,6 @@ export default {
   HOME_QUICK_ENTRY: `${KEY_PREFIX}home_quick_entry`,
   // 通知信息已读
   NOTICE_READ: `${KEY_PREFIX}notice_read`,
+  // 待办
+  TO_BE_DONE: `${KEY_PREFIX}to_be_done`,
 };
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-avatar.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-avatar.vue
index 5af75daa..7540c1b0 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-avatar.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-avatar.vue
@@ -37,7 +37,6 @@
   import { computed, ref, onMounted } from 'vue';
   import { loginApi } from '/src/api/system/login-api';
   import { useUserStore } from '/@/store/modules/system/user';
-  import { localClear } from '/@/utils/local-util';
   import { smartSentry } from '/@/lib/smart-sentry';
   import HeaderResetPassword from './header-reset-password-modal/index.vue';
   import { useRouter } from 'vue-router';
@@ -53,7 +52,6 @@
     } catch (e) {
       smartSentry.captureError(e);
     } finally {
-      localClear();
       useUserStore().logout();
       location.reload();
     }
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue
index d50337b5..e457cc8a 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue
@@ -10,19 +10,21 @@
 
 <template>
   <a-dropdown trigger="click" v-model:open="show">
-    <a-button type="text" @click="queryMessage" style="padding: 4px 5px">
-      <a-badge :count="unreadMessageCount">
-        <div style="width: 26px; height: 26px">
-          <BellOutlined :style="{ fontSize: '16px' }" />
-        </div>
-      </a-badge>
-    </a-button>
+    <a-badge :count="unreadMessageCount + toBeDoneCount">
+      <div style="width: 26px; height: 26px">
+        <BellOutlined :style="{ fontSize: '16px' }" />
+      </div>
+    </a-badge>
 
     <template #overlay>
       <a-card class="message-container" :bodyStyle="{ padding: 0 }">
         <a-spin :spinning="loading">
           <a-tabs class="dropdown-tabs" centered :tabBarStyle="{ textAlign: 'center' }" style="width: 300px">
-            <a-tab-pane tab="未读消息" key="message">
+            <a-tab-pane key="message">
+              <template #tab>
+                未读消息
+                <a-badge :count="unreadMessageCount" showZero :offset="[0, -20]" />
+              </template>
               <a-list class="tab-pane" size="small">
                 <a-list-item v-for="item in messageList" :key="item.messageId">
                   <a-list-item-meta>
@@ -36,16 +38,34 @@
                     </template>
                   </a-list-item-meta>
                 </a-list-item>
+                <a-list-item v-if="unreadMessageCount !== 0">
+                  <a-button type="text" @click="gotoMessage" style="padding: 4px 5px"> ... 查看更多 </a-button>
+                </a-list-item>
               </a-list>
             </a-tab-pane>
-            <a-tab-pane tab="待办工作" key="todo">
-              <a-list class="tab-pane" />
+            <a-tab-pane key="TO_BE_DONE">
+              <template #tab>
+                待办工作
+                <a-badge :count="toBeDoneCount" showZero :offset="[0, -20]" />
+              </template>
+              <a-list class="tab-pane" size="small" :locale="{ emptyText: '暂无待办' }">
+                <a-list-item v-for="(item, index) in toBeDoneList" :key="index">
+                  <a-list-item-meta>
+                    <template #title>
+                      <a-badge status="error" />
+                      <a-tag v-if="item.starFlag" color="red">重要</a-tag>
+                      <span>{{ item.title }}</span>
+                    </template>
+                  </a-list-item-meta>
+                </a-list-item>
+              </a-list>
             </a-tab-pane>
           </a-tabs>
         </a-spin>
       </a-card>
     </template>
   </a-dropdown>
+  <MessageDetail ref="messageDetailRef" @refresh="queryMessage" />
 </template>
 
 <script setup>
@@ -57,6 +77,9 @@
   import dayjs from 'dayjs';
   import { theme } from 'ant-design-vue';
   import { useRouter } from 'vue-router';
+  import MessageDetail from '/@/views/system/account/components/message/components/message-detail.vue';
+  import localKey from '/@/constants/local-storage-key-const';
+  import { localRead } from '/@/utils/local-util';
 
   const { useToken } = theme;
   const { token } = useToken();
@@ -64,6 +87,8 @@
   defineExpose({ showMessage });
 
   function showMessage() {
+    queryMessage();
+    loadToBeDoneList();
     show.value = true;
   }
 
@@ -90,6 +115,8 @@
         readFlag: false,
       });
       messageList.value = responseModel.data.list;
+      // 若中途有新消息了 打开列表也能及时更新未读数量
+      useUserStore().queryUnreadMessageCount();
     } catch (e) {
       smartSentry.captureError(e);
     } finally {
@@ -103,6 +130,30 @@
     router.push({ path: '/account', query: { menuId: 'message' } });
   }
 
+  // ------------------------- 待办工作  -------------------------
+
+  // 待办工作数
+  const toBeDoneCount = computed(() => {
+    return useUserStore().toBeDoneCount;
+  });
+
+  // 待办工作列表
+  const toBeDoneList = ref([]);
+
+  const loadToBeDoneList = async () => {
+    try {
+      loading.value = true;
+      let localToBeDoneList = localRead(localKey.TO_BE_DONE);
+      if (localToBeDoneList) {
+        toBeDoneList.value = JSON.parse(localToBeDoneList).filter((e) => !e.doneFlag);
+      }
+    } catch (err) {
+      smartSentry.captureError(err);
+    } finally {
+      loading.value = false;
+    }
+  };
+
   // ------------------------- 时间计算  -------------------------
   function timeago(dateStr) {
     let dateTimeStamp = dayjs(dateStr).toDate().getTime();
@@ -189,4 +240,9 @@
     background-color: @base-bg-color;
     border-radius: 4px;
   }
+
+  .tab-pane {
+    height: 250px;
+    overflow-y: auto;
+  }
 </style>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue
index 62c2e413..4ef0c682 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue
@@ -18,7 +18,9 @@
         size="small"
       />
       <!---消息通知--->
-      <HeaderMessage ref="headerMessage" />
+      <a-button type="text" @click="showMessage" style="padding: 4px 5px">
+        <HeaderMessage ref="headerMessage" />
+      </a-button>
       <!---国际化--->
       <!-- <a-button type="text" @click="showSetting" class="operate-icon">
         <template #icon><switcher-outlined /></template>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/lib/axios.js b/smart-admin-web/javascript-ant-design-vue3/src/lib/axios.js
index e77c4419..b340b2d5 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/lib/axios.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/lib/axios.js
@@ -9,7 +9,8 @@
  */
 import { message, Modal } from 'ant-design-vue';
 import axios from 'axios';
-import { localClear, localRead } from '/@/utils/local-util';
+import { localRead } from '/@/utils/local-util';
+import { useUserStore } from '/@/store/modules/system/user';
 import { decryptData, encryptData } from './encrypt';
 import { DATA_TYPE_ENUM } from '../constants/common-const';
 import _ from 'lodash';
@@ -25,7 +26,7 @@ const smartAxios = axios.create({
 
 // 退出系统
 function logout() {
-  localClear();
+  useUserStore.logout();
   location.href = '/';
 }
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/router/index.js b/smart-admin-web/javascript-ant-design-vue3/src/router/index.js
index b34d2b7b..2a72de83 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/router/index.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/router/index.js
@@ -16,7 +16,7 @@ import { PAGE_PATH_404, PAGE_PATH_LOGIN } from '/@/constants/common-const';
 import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
 import SmartLayout from '../layout/index.vue';
 import { useUserStore } from '/@/store/modules/system/user';
-import { localClear, localRead } from '/@/utils/local-util';
+import { localRead } from '/@/utils/local-util';
 import _ from 'lodash';
 import LocalStorageKeyConst from '/@/constants/local-storage-key-const.js';
 
@@ -41,7 +41,7 @@ router.beforeEach(async (to, from, next) => {
   // 验证登录
   const token = localRead(LocalStorageKeyConst.USER_TOKEN);
   if (!token) {
-    localClear();
+    useUserStore().logout();
     next({ path: PAGE_PATH_LOGIN });
     return;
   }
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/user.js b/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/user.js
index becf2140..c26579ac 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/user.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/user.js
@@ -12,10 +12,10 @@ import { defineStore } from 'pinia';
 import localKey from '/@/constants/local-storage-key-const';
 import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
 import { MENU_TYPE_ENUM } from '/@/constants/system/menu-const';
-import { localClear, localRead, localSave } from '/@/utils/local-util';
-import LocalStorageKeyConst from '/@/constants/local-storage-key-const';
 import { messageApi } from '/@/api/support/message-api.js';
 import { smartSentry } from '/@/lib/smart-sentry.js';
+import { localRead, localSave, localRemove } from '/@/utils/local-util';
+
 
 export const useUserStore = defineStore({
   id: 'userStore',
@@ -61,13 +61,15 @@ export const useUserStore = defineStore({
     keepAliveIncludes: [],
     // 未读消息数量
     unreadMessageCount: 0,
+    // 待办工作数
+    toBeDoneCount: 0,
   }),
   getters: {
     getToken(state) {
       if (state.token) {
         return state.token;
       }
-      return localRead(LocalStorageKeyConst.USER_TOKEN);
+      return localRead(localKey.USER_TOKEN);
     },
     //是否初始化了 路由
     getMenuRouterInitFlag(state) {
@@ -115,7 +117,9 @@ export const useUserStore = defineStore({
       this.tagNav = [];
       this.userInfo = {};
       this.unreadMessageCount = 0;
-      localClear();
+      localRemove(localKey.USER_TOKEN);
+      localRemove(localKey.USER_POINTS);
+      localRemove(localKey.USER_TAG_NAV);
     },
     // 查询未读消息数量
     async queryUnreadMessageCount() {
@@ -126,6 +130,16 @@ export const useUserStore = defineStore({
         smartSentry.captureError(e);
       }
     },
+    async queryToBeDoneList() {
+      try {
+        let localToBeDoneList = localRead(localKey.TO_BE_DONE);
+        if (localToBeDoneList) {
+          this.toBeDoneCount = JSON.parse(localToBeDoneList).filter((e) => !e.doneFlag).length;
+        }
+      } catch (err) {
+        smartSentry.captureError(err);
+      }
+    },
     //设置登录信息
     setUserLoginInfo(data) {
       // 用户基本信息
@@ -157,6 +171,8 @@ export const useUserStore = defineStore({
 
       // 获取用户未读消息
       this.queryUnreadMessageCount();
+      // 获取待办工作数
+      this.queryToBeDoneList();
     },
     setToken(token) {
       this.token = token;
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/utils/local-util.js b/smart-admin-web/javascript-ant-design-vue3/src/utils/local-util.js
index cb167a33..80e8903b 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/utils/local-util.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/utils/local-util.js
@@ -19,3 +19,7 @@ export const localRead = (key) => {
 export const localClear = () => {
   localStorage.clear();
 };
+
+export const localRemove = (key) => {
+  localStorage.removeItem(key);
+};
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/index.vue
index 885f2054..da4dc552 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/index.vue
@@ -43,7 +43,7 @@
   </a-form>
 
   <a-table size="small" :dataSource="tableData" :columns="columns" rowKey="messageId" :pagination="false" bordered>
-    <template #bodyCell="{ text, record, index, column }">
+    <template #bodyCell="{ text, record, column }">
       <template v-if="column.dataIndex === 'messageType'">
         <span>{{ $smartEnumPlugin.getDescByValue('MESSAGE_TYPE_ENUM', text) }}</span>
       </template>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card.vue
deleted file mode 100644
index bad2a524..00000000
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--
-  * 已办/代办
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-12 22:34:00 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
-  *
--->
-<template>
-  <default-home-card icon="Star" title="已办待办">
-    <div style="height: 280px">
-      <div class="center column">
-        <a-space direction="vertical" style="width: 100%">
-          <div v-for="(item, index) in toDoList" :key="index" :class="['to-do', { done: item.doneFlag }]">
-            <a-checkbox v-model:checked="item.doneFlag">
-              <span class="task">{{ item.title }}</span>
-            </a-checkbox>
-            <div class="star-icon" @click="itemStar(item)">
-              <StarFilled v-if="item.starFlag" style="color: #ff8c00" />
-              <StarOutlined v-else style="color: #c0c0c0" />
-            </div>
-          </div>
-          <div v-for="(item, index) in doneList" :key="index" :class="['to-do', { done: item.doneFlag }]">
-            <a-checkbox v-model:checked="item.doneFlag">
-              <span class="task">{{ item.title }}</span>
-            </a-checkbox>
-            <div class="star-icon" @click="itemStar(item)">
-              <StarFilled v-if="item.starFlag" style="color: #ff8c00" />
-              <StarOutlined v-else style="color: #c0c0c0" />
-            </div>
-          </div>
-        </a-space>
-      </div>
-    </div>
-  </default-home-card>
-</template>
-<script setup>
-  import DefaultHomeCard from '/@/views/system/home/components/default-home-card.vue';
-  import { computed, ref } from 'vue';
-  import dayjs from 'dayjs';
-  import { message } from 'ant-design-vue';
-
-  let taskList = ref([
-    {
-      title: '周五下班前需要提交周报',
-      doneFlag: true,
-      starFlag: true,
-      starTime: 0,
-    },
-    {
-      title: '为SmartAdmin前端小组分配任务',
-      doneFlag: false,
-      starFlag: false,
-      starTime: 0,
-    },
-    {
-      title: '跟进团建内容事宜',
-      doneFlag: false,
-      starFlag: true,
-      starTime: 0,
-    },
-    {
-      title: '跟进客户定制一个软件平台',
-      doneFlag: false,
-      starFlag: false,
-      starTime: 0,
-    },
-    {
-      title: '下个版本的需求确认',
-      doneFlag: false,
-      starFlag: false,
-      starTime: 0,
-    },
-    {
-      title: '线上版本发布',
-      doneFlag: true,
-      starFlag: true,
-      starTime: dayjs().unix(),
-    },
-    {
-      title: '周一财务报销',
-      doneFlag: true,
-      starFlag: false,
-      starTime: 0,
-    },
-  ]);
-
-  let toDoList = computed(() => {
-    return taskList.value.filter((e) => !e.doneFlag).sort((a, b) => b.starTime - a.starTime);
-  });
-
-  let doneList = computed(() => {
-    return taskList.value.filter((e) => e.doneFlag);
-  });
-
-  function itemStar(item) {
-    item.starFlag = !item.starFlag;
-    if (item.starFlag) {
-      item.starTime = dayjs().unix();
-    }
-  }
-
-  //-------------------------任务新建-----------------------
-  let taskTitle = ref('');
-  function addTask() {
-    if (!taskTitle.value) {
-      message.warn('请输入任务标题');
-      return;
-    }
-    let data = {
-      title: taskTitle.value,
-      doneFlag: false,
-      starFlag: false,
-      starTime: 0,
-    };
-    taskList.value.unshift(data);
-    taskTitle.value = '';
-  }
-</script>
-<style lang="less" scoped>
-  .center {
-    display: flex;
-    justify-content: center;
-    height: 100%;
-
-    &.column {
-      flex-direction: column;
-      width: 100%;
-      padding: 0 10px;
-      justify-content: flex-start;
-    }
-  }
-
-  .to-do {
-    width: 100%;
-    border: 1px solid #d3d3d3;
-    border-radius: 4px;
-    padding: 4px;
-    display: flex;
-    align-items: center;
-
-    .star-icon {
-      margin-left: auto;
-      cursor: pointer;
-    }
-
-    &.done {
-      text-decoration: line-through;
-      color: #8c8c8c;
-
-      .task {
-        color: #8c8c8c;
-      }
-    }
-  }
-</style>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/home-to-be-done.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/home-to-be-done.vue
new file mode 100644
index 00000000..c6f1a5a5
--- /dev/null
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/home-to-be-done.vue
@@ -0,0 +1,172 @@
+<!--
+  * 已办/代办
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
+  * @Date:      2022-09-12 22:34:00
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+-->
+<template>
+  <default-home-card extra="添加" icon="StarTwoTone" title="待办工作" @extraClick="showAddToBeDone">
+    <div style="height: 280px">
+      <div class="center column">
+        <a-space direction="vertical" style="width: 100%">
+          <a-empty v-if="$lodash.isEmpty(toBeDoneList)" description="暂无待办工作" />
+          <div v-for="(item, index) in toDoList" :key="index" :class="['to-do', { done: item.doneFlag }]">
+            <a-checkbox v-model:checked="item.doneFlag" @change="handleCheckbox">
+              <span class="task">{{ item.title }}</span>
+            </a-checkbox>
+            <div v-if="!item.doneFlag" class="star-icon" @click="itemStar(item)">
+              <StarFilled v-if="item.starFlag" style="color: #ff8c00" />
+              <StarOutlined v-else style="color: #c0c0c0" />
+            </div>
+            <close-circle-outlined class="delete-icon" @click="toDelete(item)" />
+          </div>
+          <div v-for="(item, index) in doneList" :key="index" :class="['to-do', { done: item.doneFlag }]">
+            <a-checkbox v-model:checked="item.doneFlag" @change="handleCheckbox">
+              <span class="task">{{ item.title }}</span>
+            </a-checkbox>
+            <div v-if="!item.doneFlag" class="star-icon" @click="itemStar(item)">
+              <StarFilled v-if="item.starFlag" style="color: #ff8c00" />
+              <StarOutlined v-else style="color: #c0c0c0" />
+            </div>
+            <close-circle-outlined class="delete-icon" @click="toDelete(item)" />
+          </div>
+        </a-space>
+      </div>
+    </div>
+  </default-home-card>
+  <ToBeDoneModal ref="toBeDoneModalRef" @addToBeDone="addToBeDone" />
+</template>
+<script setup>
+  import DefaultHomeCard from '/@/views/system/home/components/default-home-card.vue';
+  import ToBeDoneModal from './to-be-done-modal.vue';
+  import localKey from '/@/constants/local-storage-key-const';
+  import { localRead, localSave } from '/@/utils/local-util';
+  import { useUserStore } from '/@/store/modules/system/user.js';
+  import { computed, ref, onMounted } from 'vue';
+  import { Modal } from 'ant-design-vue';
+
+  let toBeDoneList = ref([]);
+
+  onMounted(() => {
+    initTaskList();
+  });
+
+  function initTaskList() {
+    let localTaskList = localRead(localKey.TO_BE_DONE);
+    if (localTaskList) {
+      toBeDoneList.value = JSON.parse(localTaskList);
+    }
+  }
+
+  let toDoList = computed(() => {
+    return toBeDoneList.value.filter((e) => !e.doneFlag);
+  });
+
+  let doneList = computed(() => {
+    return toBeDoneList.value.filter((e) => e.doneFlag);
+  });
+
+  function handleCheckbox(e) {
+    localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
+  }
+
+  function itemStar(data) {
+    data.starFlag = !data.starFlag;
+    const index = toBeDoneList.value.findIndex((item) => item.title === data.title);
+    toBeDoneList.value.splice(index, 1);
+    if (data.starFlag) {
+      toBeDoneList.value.unshift(data);
+    } else {
+      toBeDoneList.value.push(data);
+    }
+    localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
+  }
+
+  //-------------------------任务新建-----------------------
+
+  let toBeDoneModalRef = ref();
+
+  function showAddToBeDone() {
+    toBeDoneModalRef.value.showModal();
+  }
+
+  // 添加待办工作
+  function addToBeDone(data) {
+    toBeDoneList.value.unshift(data);
+    useUserStore().toBeDoneCount = toBeDoneList.value.length;
+    localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
+  }
+
+  function toDelete(data) {
+    if (!data.doneFlag) {
+      Modal.confirm({
+        title: '提示',
+        content: '确定要删除吗?',
+        okText: '删除',
+        okType: 'danger',
+        onOk() {
+          deleteToBeDone(data);
+        },
+        cancelText: '取消',
+        onCancel() {},
+      });
+    } else {
+      deleteToBeDone(data);
+    }
+  }
+
+  // 删除待办工作
+  function deleteToBeDone(data) {
+    const index = toBeDoneList.value.findIndex((item) => item.title === data.title);
+    toBeDoneList.value.splice(index, 1);
+    useUserStore().toBeDoneCount = toBeDoneList.value.length;
+    localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
+  }
+</script>
+<style lang="less" scoped>
+  .center {
+    display: flex;
+    justify-content: center;
+    height: 100%;
+    overflow-y: auto;
+
+    &.column {
+      flex-direction: column;
+      width: 100%;
+      padding: 0 10px;
+      justify-content: flex-start;
+    }
+  }
+
+  .to-do {
+    width: 100%;
+    border: 1px solid #d3d3d3;
+    border-radius: 4px;
+    padding: 4px;
+    display: flex;
+    align-items: center;
+    .star-icon {
+      margin-left: auto;
+      cursor: pointer;
+    }
+
+    &.done {
+      text-decoration: line-through;
+      color: #8c8c8c;
+
+      .task {
+        color: #8c8c8c;
+      }
+    }
+  }
+
+  .delete-icon {
+    color: #f08080;
+    padding-left: 10px;
+    top: -5px;
+    right: -5px;
+    float: right;
+  }
+</style>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue
new file mode 100644
index 00000000..a8054944
--- /dev/null
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue
@@ -0,0 +1,63 @@
+<template>
+  <a-modal v-model:open="visible" title="新建待办" @close="onClose">
+    <a-form ref="formRef" :model="form" :rules="rules">
+      <a-form-item label="标题" name="title">
+        <a-input v-model:value="form.title" placeholder="请输入标题" />
+      </a-form-item>
+    </a-form>
+    <template #footer>
+      <a-button @click="onClose">取消</a-button>
+      <a-button type="primary" @click="onSubmit">确定</a-button>
+    </template>
+  </a-modal>
+</template>
+<script setup>
+  import { reactive, ref } from 'vue';
+  import { message } from 'ant-design-vue';
+  import _ from 'lodash';
+
+  defineExpose({
+    showModal,
+  });
+
+  const emit = defineEmits(['addToBeDone']);
+
+  // 组件ref
+  const formRef = ref();
+
+  const formDefault = {
+    title: undefined,
+    doneFlag: false,
+    starFlag: false,
+    starTime: 0,
+  };
+  let form = reactive({ ...formDefault });
+  const rules = {
+    title: [{ required: true, message: '标题不能为空' }],
+  };
+
+  const visible = ref(false);
+
+  function showModal() {
+    visible.value = true;
+  }
+
+  function onClose() {
+    Object.assign(form, formDefault);
+    visible.value = false;
+  }
+
+  function onSubmit() {
+    formRef.value
+      .validate()
+      .then(() => {
+        emit('addToBeDone', _.cloneDeep(form));
+        onClose();
+      })
+      .catch((error) => {
+        console.log('error', error);
+        message.error('参数验证错误，请仔细填写表单数据!');
+      });
+  }
+</script>
+<style lang="less" scoped></style>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/index.vue
index 78c997c0..72e92434 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/index.vue
@@ -70,7 +70,7 @@
   import HomeNotice from './home-notice.vue';
   import HomeQuickEntry from './components/quick-entry/home-quick-entry.vue';
   import OfficialAccountCard from './components/official-account-card.vue';
-  import ToBeDoneCard from './components/to-be-done-card.vue';
+  import ToBeDoneCard from './components/to-be-done-card/home-to-be-done.vue';
   import ChangelogCard from './components/changelog-card.vue';
   import Gauge from './components/echarts/gauge.vue';
   import Category from './components/echarts/category.vue';

From bf64f525fbb6c9206dcaf63c1ad4db2517d86647 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sat, 3 Aug 2024 23:38:54 +0800
Subject: [PATCH 06/22] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E7=9A=84=E7=9B=B4=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/components/default-home-card.vue     | 23 ++-----------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/default-home-card.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/default-home-card.vue
index 0b74a5a5..c6bff498 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/default-home-card.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/default-home-card.vue
@@ -9,7 +9,7 @@
   *
 -->
 <template>
-  <div class="card-container">
+  <div>
     <a-card size="small">
       <template #title>
         <div class="title">
@@ -47,23 +47,4 @@
     return token.colorPrimary;
   });
 </script>
-<style lang="less" scoped>
-  .card-container {
-    background-color: #fff;
-    height: 100%;
-
-    .title {
-      display: flex;
-      align-items: center;
-      &::before {
-        content: '';
-        position: absolute;
-        top: 3px;
-        left: 0;
-        width: 3px;
-        height: 30px;
-        background-color: v-bind('token.colorPrimary');
-      }
-    }
-  }
-</style>
+<style lang="less" scoped></style>

From ecd671682ee14fd831f18a97929d12b8af09f010 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sun, 4 Aug 2024 11:38:16 +0800
Subject: [PATCH 07/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A4=B4=E9=83=A8=E7=9A=84=E6=B6=88=E6=81=AF=E6=B0=94=E6=B3=A1?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../header-message-detail-modal.vue           | 44 +++++++++++++
 .../header-user-space/header-message.vue      | 65 +++++++++++--------
 .../header-user-space/header-setting.vue      |  4 +-
 .../components/header-user-space/index.vue    | 10 +--
 .../src/lib/axios.js                          |  2 +-
 5 files changed, 85 insertions(+), 40 deletions(-)
 create mode 100644 smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message-detail-modal.vue

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message-detail-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message-detail-modal.vue
new file mode 100644
index 00000000..69164b5b
--- /dev/null
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message-detail-modal.vue
@@ -0,0 +1,44 @@
+<template>
+  <a-modal v-model:open="showFlag" :width="800" title="消息内容" :destroyOnClose="true" @ok="showFlag = false">
+    <a-descriptions bordered :column="2" size="small">
+      <a-descriptions-item :labelStyle="{ width: '80px' }" :span="1" label="类型"
+        >{{ $smartEnumPlugin.getDescByValue('MESSAGE_TYPE_ENUM', messageDetail.messageType) }}
+      </a-descriptions-item>
+      <a-descriptions-item :labelStyle="{ width: '120px' }" :span="1" label="发送时间">{{ messageDetail.createTime }}</a-descriptions-item>
+      <a-descriptions-item :labelStyle="{ width: '80px' }" :span="2" label="标题">{{ messageDetail.title }}</a-descriptions-item>
+      <a-descriptions-item :labelStyle="{ width: '80px' }" :span="2" label="内容">
+        <pre>{{ messageDetail.content }}</pre>
+      </a-descriptions-item>
+    </a-descriptions>
+  </a-modal>
+</template>
+<script setup>
+  import { reactive, ref } from 'vue';
+  import { messageApi } from '/@/api/support/message-api.js';
+
+  const emit = defineEmits(['refresh']);
+
+  const messageDetail = reactive({
+    messageType: '',
+    title: '',
+    content: '',
+    createTime: '',
+  });
+
+  const showFlag = ref(false);
+
+  function show(data) {
+    Object.assign(messageDetail, data);
+    showFlag.value = true;
+    read(data);
+  }
+
+  async function read(message) {
+    if (!message.readFlag) {
+      await messageApi.updateReadFlag(message.messageId);
+      emit('refresh');
+    }
+  }
+
+  defineExpose({ show });
+</script>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue
index e457cc8a..699bf975 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue
@@ -9,15 +9,19 @@
 -->
 
 <template>
-  <a-dropdown trigger="click" v-model:open="show">
-    <a-badge :count="unreadMessageCount + toBeDoneCount">
-      <div style="width: 26px; height: 26px">
-        <BellOutlined :style="{ fontSize: '16px' }" />
-      </div>
-    </a-badge>
+  <div>
+    <a-popover v-model:open="show" trigger="contextmenu" placement="bottomLeft" @openChange="() => (show = true)">
+      <a-button type="text" @click="showMessage" style="padding: 4px 5px">
+        <a-badge :count="unreadMessageCount + toBeDoneCount">
+          <div style="width: 26px; height: 26px">
+            <BellOutlined :style="{ fontSize: '16px' }" />
+          </div>
+        </a-badge>
+      </a-button>
 
-    <template #overlay>
-      <a-card class="message-container" :bodyStyle="{ padding: 0 }">
+      <template #content>
+        <!-- 为了能在点击查看消息详情弹窗的同时防止消息气泡卡片关闭 所以加了一个手动关闭按钮 -->
+        <a-button type="text" @click="closeMessage" style="padding: 4px 5px"> 关闭 </a-button>
         <a-spin :spinning="loading">
           <a-tabs class="dropdown-tabs" centered :tabBarStyle="{ textAlign: 'center' }" style="width: 300px">
             <a-tab-pane key="message">
@@ -30,7 +34,8 @@
                   <a-list-item-meta>
                     <template #title>
                       <div class="title">
-                        <a @click="gotoMessage">{{ item.title }}</a>
+                        <a-badge status="error" />
+                        <a @click="showMessageDetail(item)">{{ item.title }}</a>
                       </div>
                     </template>
                     <template #description>
@@ -38,12 +43,12 @@
                     </template>
                   </a-list-item-meta>
                 </a-list-item>
-                <a-list-item v-if="unreadMessageCount !== 0">
+                <a-list-item v-if="unreadMessageCount > 3">
                   <a-button type="text" @click="gotoMessage" style="padding: 4px 5px"> ... 查看更多 </a-button>
                 </a-list-item>
               </a-list>
             </a-tab-pane>
-            <a-tab-pane key="TO_BE_DONE">
+            <a-tab-pane key="to_be_done">
               <template #tab>
                 待办工作
                 <a-badge :count="toBeDoneCount" showZero :offset="[0, -20]" />
@@ -62,10 +67,10 @@
             </a-tab-pane>
           </a-tabs>
         </a-spin>
-      </a-card>
-    </template>
-  </a-dropdown>
-  <MessageDetail ref="messageDetailRef" @refresh="queryMessage" />
+      </template>
+    </a-popover>
+    <MessageDetailModal ref="messageDetailModalRef" @refresh="queryMessage" />
+  </div>
 </template>
 
 <script setup>
@@ -77,24 +82,27 @@
   import dayjs from 'dayjs';
   import { theme } from 'ant-design-vue';
   import { useRouter } from 'vue-router';
-  import MessageDetail from '/@/views/system/account/components/message/components/message-detail.vue';
+  import MessageDetailModal from './header-message-detail-modal.vue';
   import localKey from '/@/constants/local-storage-key-const';
   import { localRead } from '/@/utils/local-util';
 
   const { useToken } = theme;
   const { token } = useToken();
 
-  defineExpose({ showMessage });
-
-  function showMessage() {
-    queryMessage();
-    loadToBeDoneList();
-    show.value = true;
-  }
-
   const loading = ref(false);
   const show = ref(false);
 
+  // 点击按钮打开消息气泡卡片的同时刷新消息
+  function showMessage() {
+    show.value = true;
+    queryMessage();
+    loadToBeDoneList();
+  }
+
+  function closeMessage() {
+    show.value = false;
+  }
+
   // ------------------------- 查询消息  -------------------------
 
   // 未读消息
@@ -124,6 +132,11 @@
     }
   }
 
+  const messageDetailModalRef = ref();
+  function showMessageDetail(data) {
+    messageDetailModalRef.value.show(data);
+  }
+
   const router = useRouter();
   function gotoMessage() {
     show.value = false;
@@ -232,10 +245,6 @@
     cursor: pointer;
   }
 
-  .message-container {
-    border: #eeeeee solid 1px;
-  }
-
   .dropdown-tabs {
     background-color: @base-bg-color;
     border-radius: 4px;
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
index 77b4cb07..9fdbbc34 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
@@ -18,7 +18,7 @@
       </a-form-item>
       <a-form-item :label="$t('setting.color')">
         <div class="color-container">
-          <template v-for="(item, index) in themeColors">
+          <template v-for="(item, index) in themeColors" :key="index">
             <div v-if="index === formState.colorIndex" class="color">
               <CheckSquareFilled :style="{ color: item.primaryColor, fontSize: '22px' }" />
             </div>
@@ -34,7 +34,7 @@
               >
                 <path
                   d="M128 160.01219c0-17.67619 14.336-32.01219 32.01219-32.01219h704c17.65181 0 31.98781 14.336 31.98781 32.01219v704c0 17.65181-14.336 31.98781-32.01219 31.98781H160.036571a31.98781 31.98781 0 0 1-32.01219-32.01219V160.036571z"
-                ></path>
+                />
               </svg>
             </div>
           </template>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue
index 4ef0c682..cedaa547 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue
@@ -18,9 +18,7 @@
         size="small"
       />
       <!---消息通知--->
-      <a-button type="text" @click="showMessage" style="padding: 4px 5px">
-        <HeaderMessage ref="headerMessage" />
-      </a-button>
+      <HeaderMessage ref="headerMessage" />
       <!---国际化--->
       <!-- <a-button type="text" @click="showSetting" class="operate-icon">
         <template #icon><switcher-outlined /></template>
@@ -59,12 +57,6 @@
     headerSetting.value.show();
   }
 
-  //消息通知
-  const headerMessage = ref();
-  function showMessage() {
-    headerMessage.value.showMessage();
-  }
-
   //帮助文档
   function showHelpDoc() {
     useAppConfigStore().showHelpDoc();
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/lib/axios.js b/smart-admin-web/javascript-ant-design-vue3/src/lib/axios.js
index b340b2d5..2ee2b2d1 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/lib/axios.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/lib/axios.js
@@ -26,7 +26,7 @@ const smartAxios = axios.create({
 
 // 退出系统
 function logout() {
-  useUserStore.logout();
+  useUserStore().logout();
   location.href = '/';
 }
 

From 15cc4a9003580a22f9b56c4e6e4e6bfa3cf407f4 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sun, 4 Aug 2024 11:46:47 +0800
Subject: [PATCH 08/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E5=BE=85=E5=8A=9E=E5=B7=A5=E4=BD=9C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8E=E6=A0=87=E8=AE=B0star=E7=9A=84=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../to-be-done-card/home-to-be-done.vue       | 15 ++++++++----
 .../to-be-done-card/to-be-done-modal.vue      | 24 ++++++++++---------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/home-to-be-done.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/home-to-be-done.vue
index c6f1a5a5..c9920cb7 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/home-to-be-done.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/home-to-be-done.vue
@@ -1,5 +1,5 @@
 <!--
-  * 已办/代办
+  * 待办工作
   * 
   * @Author:    1024创新实验室-主任：卓大 
   * @Date:      2022-09-12 22:34:00
@@ -70,16 +70,21 @@
 
   function handleCheckbox(e) {
     localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
+    useUserStore().toBeDoneCount = toDoList.value.length;
   }
 
   function itemStar(data) {
     data.starFlag = !data.starFlag;
+    // 将取消 star 的删除掉
     const index = toBeDoneList.value.findIndex((item) => item.title === data.title);
     toBeDoneList.value.splice(index, 1);
     if (data.starFlag) {
+      // 最新添加标记star的移动到第一位
       toBeDoneList.value.unshift(data);
     } else {
-      toBeDoneList.value.push(data);
+      // 取消标记star的移动到最后一个标记 star 的后面添加
+      const lastStarIndex = toBeDoneList.value.findLastIndex((item) => item.starFlag);
+      toBeDoneList.value.splice(lastStarIndex + 1, 0, data);
     }
     localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
   }
@@ -94,9 +99,9 @@
 
   // 添加待办工作
   function addToBeDone(data) {
-    toBeDoneList.value.unshift(data);
-    useUserStore().toBeDoneCount = toBeDoneList.value.length;
+    toBeDoneList.value.push(data);
     localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
+    useUserStore().toBeDoneCount = toDoList.value.length;
   }
 
   function toDelete(data) {
@@ -121,8 +126,8 @@
   function deleteToBeDone(data) {
     const index = toBeDoneList.value.findIndex((item) => item.title === data.title);
     toBeDoneList.value.splice(index, 1);
-    useUserStore().toBeDoneCount = toBeDoneList.value.length;
     localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
+    useUserStore().toBeDoneCount = toDoList.value.length;
   }
 </script>
 <style lang="less" scoped>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue
index a8054944..1718e7ae 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue
@@ -1,15 +1,17 @@
 <template>
-  <a-modal v-model:open="visible" title="新建待办" @close="onClose">
-    <a-form ref="formRef" :model="form" :rules="rules">
-      <a-form-item label="标题" name="title">
-        <a-input v-model:value="form.title" placeholder="请输入标题" />
-      </a-form-item>
-    </a-form>
-    <template #footer>
-      <a-button @click="onClose">取消</a-button>
-      <a-button type="primary" @click="onSubmit">确定</a-button>
-    </template>
-  </a-modal>
+  <div>
+    <a-modal v-model:open="visible" title="新建待办" @close="onClose">
+      <a-form ref="formRef" :model="form" :rules="rules">
+        <a-form-item label="标题" name="title">
+          <a-input v-model:value="form.title" placeholder="请输入标题" />
+        </a-form-item>
+      </a-form>
+      <template #footer>
+        <a-button @click="onClose">取消</a-button>
+        <a-button type="primary" @click="onSubmit">确定</a-button>
+      </template>
+    </a-modal>
+  </div>
 </template>
 <script setup>
   import { reactive, ref } from 'vue';

From 949f7a209c614f17e09e4d43d045f3134416d084 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sun, 4 Aug 2024 11:47:40 +0800
Subject: [PATCH 09/22] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20card=20=E6=8F=92?=
 =?UTF-8?q?=E6=A7=BD=E5=8E=BB=E9=99=A4=E7=99=BD=E8=89=B2=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/components/default-home-card.vue     | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/default-home-card.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/default-home-card.vue
index c6bff498..6af4f63b 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/default-home-card.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/default-home-card.vue
@@ -9,7 +9,7 @@
   *
 -->
 <template>
-  <div>
+  <div class="card-container">
     <a-card size="small">
       <template #title>
         <div class="title">
@@ -47,4 +47,22 @@
     return token.colorPrimary;
   });
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+  .card-container {
+    height: 100%;
+
+    .title {
+      display: flex;
+      align-items: center;
+      &::before {
+        content: '';
+        position: absolute;
+        top: 3px;
+        left: 0;
+        width: 3px;
+        height: 30px;
+        background-color: v-bind('token.colorPrimary');
+      }
+    }
+  }
+</style>

From 8fd02fc519b48b69174768bc6e8e1b6e987eb900 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sun, 4 Aug 2024 14:32:23 +0800
Subject: [PATCH 10/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A1=E3=80=81?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=91=98=E5=B7=A5=E5=88=97=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=91=98=E5=B7=A5=E5=BC=B9=E7=AA=97=E4=B8=AD?=
 =?UTF-8?q?=E7=A6=81=E6=AD=A2=E6=B7=BB=E5=8A=A0=E9=80=89=E6=8B=A9=E5=B7=B2?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E8=AF=A5=E8=A7=92=E8=89=B2=E7=9A=84=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=EF=BC=9B2=E3=80=81=E7=A6=81=E6=AD=A2=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=B7=B2=E5=AD=98=E5=9C=A8=E5=91=98=E5=B7=A5=E7=9A=84?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/role/dao/RoleEmployeeDao.java      | 10 +++++--
 .../domain/form/RoleEmployeeUpdateForm.java   |  4 +--
 .../role/manager/RoleEmployeeManager.java     | 16 +-----------
 .../role/service/RoleEmployeeService.java     | 26 ++++++++++---------
 .../system/role/service/RoleService.java      |  7 ++++-
 .../mapper/system/role/RoleEmployeeMapper.xml |  8 ++++++
 .../employee-table-select-modal/index.vue     | 17 +++++++++---
 .../components/role-employee-list/index.vue   |  2 +-
 8 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleEmployeeDao.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleEmployeeDao.java
index 06f27ca5..3c2cdd0a 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleEmployeeDao.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleEmployeeDao.java
@@ -12,6 +12,7 @@ import net.lab1024.sa.admin.module.system.role.domain.form.RoleEmployeeQueryForm
 import net.lab1024.sa.admin.module.system.role.domain.vo.RoleEmployeeVO;
 
 import java.util.List;
+import java.util.Set;
 
 
 /**
@@ -50,7 +51,7 @@ public interface RoleEmployeeDao extends BaseMapper<RoleEmployeeEntity> {
     /**
      * 查询角色下的人员id
      */
-    List<Long> selectEmployeeIdByRoleIdList(@Param("roleIdList") List<Long> roleIdList);
+    Set<Long> selectEmployeeIdByRoleIdList(@Param("roleIdList") List<Long> roleIdList);
 
     /**
      *
@@ -79,5 +80,10 @@ public interface RoleEmployeeDao extends BaseMapper<RoleEmployeeEntity> {
     /**
      * 批量删除某个角色下的某批用户的关联关系
      */
-    void batchDeleteEmployeeRole(@Param("roleId") Long roleId,@Param("employeeIds")List<Long> employeeIds);
+    void batchDeleteEmployeeRole(@Param("roleId") Long roleId, @Param("employeeIds") Set<Long> employeeIds);
+
+    /**
+     * 判断某个角色下是否存在用户
+     */
+    Integer existsByRoleId(@Param("roleId") Long roleId);
 }
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java
index ef849e7c..4960b4ab 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java
@@ -5,7 +5,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
-import java.util.List;
+import java.util.Set;
 
 /**
  * 角色的员工更新
@@ -25,6 +25,6 @@ public class RoleEmployeeUpdateForm {
 
     @Schema(description = "员工id集合")
     @NotEmpty(message = "员工id不能为空")
-    protected List<Long> employeeIdList;
+    protected Set<Long> employeeIdList;
 
 }
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleEmployeeManager.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleEmployeeManager.java
index 9ff7f0f0..ba33dfd2 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleEmployeeManager.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleEmployeeManager.java
@@ -3,11 +3,7 @@ package net.lab1024.sa.admin.module.system.role.manager;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import net.lab1024.sa.admin.module.system.role.dao.RoleEmployeeDao;
 import net.lab1024.sa.admin.module.system.role.domain.entity.RoleEmployeeEntity;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 /**
  * 角色员工 manager
@@ -16,19 +12,9 @@ import java.util.List;
  * @Date 2022-04-08 21:53:04
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 @Service
 public class RoleEmployeeManager extends ServiceImpl<RoleEmployeeDao, RoleEmployeeEntity> {
 
-    /**
-     * 保存 角色员工
-     *
-     */
-    @Transactional(rollbackFor = Throwable.class)
-    public void saveRoleEmployee(List<RoleEmployeeEntity> roleEmployeeList) {
-        if (CollectionUtils.isNotEmpty(roleEmployeeList)) {
-            this.saveBatch(roleEmployeeList);
-        }
-    }
 }
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java
index 78b11c88..755aa892 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java
@@ -1,6 +1,7 @@
 package net.lab1024.sa.admin.module.system.role.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import net.lab1024.sa.admin.module.system.department.dao.DepartmentDao;
 import net.lab1024.sa.admin.module.system.department.domain.entity.DepartmentEntity;
 import net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO;
@@ -20,12 +21,12 @@ import net.lab1024.sa.base.common.util.SmartBeanUtil;
 import net.lab1024.sa.base.common.util.SmartPageUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -88,7 +89,6 @@ public class RoleEmployeeService {
      * 移除员工角色
      *
      */
-    @Transactional(rollbackFor = Exception.class)
     public ResponseDTO<String> removeRoleEmployee(Long employeeId, Long roleId) {
         if (null == employeeId || null == roleId) {
             return ResponseDTO.userErrorParam();
@@ -110,21 +110,23 @@ public class RoleEmployeeService {
      * 批量添加角色的成员员工
      *
      */
-    @Transactional(rollbackFor = Throwable.class)
     public ResponseDTO<String> batchAddRoleEmployee(RoleEmployeeUpdateForm roleEmployeeUpdateForm) {
         Long roleId = roleEmployeeUpdateForm.getRoleId();
-        List<Long> employeeIdList = roleEmployeeUpdateForm.getEmployeeIdList();
-        // 保存新的角色员工
-        List<RoleEmployeeEntity> roleEmployeeList = null;
-        if (CollectionUtils.isNotEmpty(employeeIdList)) {
-            roleEmployeeList = employeeIdList.stream()
+
+        // 已选择的员工id列表
+        Set<Long> selectedEmployeeIdList = roleEmployeeUpdateForm.getEmployeeIdList();
+        // 数据库里已有的员工id列表
+        Set<Long> dbEmployeeIdList = roleEmployeeDao.selectEmployeeIdByRoleIdList(Lists.newArrayList(roleId));
+        // 从已选择的员工id列表里 过滤数据库里不存在的 即需要添加的员工 id
+        Set<Long> addEmployeeIdList = selectedEmployeeIdList.stream().filter(id -> !dbEmployeeIdList.contains(id)).collect(Collectors.toSet());
+
+        // 添加角色员工
+        if (CollectionUtils.isNotEmpty(addEmployeeIdList)) {
+            List<RoleEmployeeEntity> roleEmployeeList = addEmployeeIdList.stream()
                     .map(employeeId -> new RoleEmployeeEntity(roleId, employeeId))
                     .collect(Collectors.toList());
+            roleEmployeeManager.saveBatch(roleEmployeeList);
         }
-        // 防重，删除此次角色员工数据
-        roleEmployeeDao.batchDeleteEmployeeRole(roleId, employeeIdList);
-        // 保存数据
-        roleEmployeeManager.saveRoleEmployee(roleEmployeeList);
         return ResponseDTO.ok();
     }
 
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java
index b69abea3..2d01b4bf 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java
@@ -65,6 +65,11 @@ public class RoleService {
         if (null == roleEntity) {
             return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
         }
+        // 当没有员工绑定这个角色时才可以删除
+        Integer exists = roleEmployeeDao.existsByRoleId(roleId);
+        if (exists != null) {
+            return ResponseDTO.error(UserErrorCode.ALREADY_EXIST, "该角色下存在员工，无法删除");
+        }
         roleDao.deleteById(roleId);
         roleMenuDao.deleteByRoleId(roleId);
         roleEmployeeDao.deleteByRoleId(roleId);
@@ -86,7 +91,7 @@ public class RoleService {
         }
 
         existRoleEntity = roleDao.getByRoleCode(roleUpdateForm.getRoleCode());
-        if (null != existRoleEntity) {
+        if (null != existRoleEntity && !existRoleEntity.getRoleId().equals(roleUpdateForm.getRoleId())) {
             return ResponseDTO.userErrorParam("角色编码重复，重复的角色为：" + existRoleEntity.getRoleName());
         }
 
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/system/role/RoleEmployeeMapper.xml b/smart-admin-api/sa-admin/src/main/resources/mapper/system/role/RoleEmployeeMapper.xml
index 9e0a1379..390a19c8 100644
--- a/smart-admin-api/sa-admin/src/main/resources/mapper/system/role/RoleEmployeeMapper.xml
+++ b/smart-admin-api/sa-admin/src/main/resources/mapper/system/role/RoleEmployeeMapper.xml
@@ -138,4 +138,12 @@
             #{item}
         </foreach>
     </delete>
+
+    <select id="existsByRoleId" resultType="java.lang.Integer">
+        SELECT 1
+        FROM t_role_employee er
+        WHERE er.role_id = #{roleId}
+        LIMIT 1
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/system/employee-table-select-modal/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/components/system/employee-table-select-modal/index.vue
index 4f140555..352d9b23 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/system/employee-table-select-modal/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/components/system/employee-table-select-modal/index.vue
@@ -40,7 +40,7 @@
       </a-row>
     </a-form>
     <a-table
-      :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
+      :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange, getCheckboxProps: getCheckboxProps }"
       :loading="tableLoading"
       size="small"
       :columns="columns"
@@ -95,6 +95,7 @@
 
   const visible = ref(false);
   async function showModal(selectEmployeeId) {
+    originalRowKeyList.value = selectEmployeeId || [];
     selectedRowKeyList.value = selectEmployeeId || [];
     visible.value = true;
     onSearch();
@@ -144,8 +145,9 @@
   }
 
   // ----------------------- 员工表格选择 ---------------------
+  const originalRowKeyList = ref([]);
   let selectedRowKeyList = ref([]);
-  const hasSelected = computed(() => selectedRowKeyList.value.length > 0);
+  const hasSelected = computed(() => selectedRowKeyList.value.length !== originalRowKeyList.value.length);
 
   function onSelectChange(selectedRowKeys) {
     selectedRowKeyList.value = selectedRowKeys;
@@ -156,10 +158,19 @@
       message.warning('请选择角色人员');
       return;
     }
-    emits('selectData', selectedRowKeyList.value);
+    // 过滤出新选择的人员id
+    const newEmployeeIdList = selectedRowKeyList.value.filter((id) => !originalRowKeyList.value.includes(id));
+    emits('selectData', newEmployeeIdList);
     closeModal();
   }
 
+  function getCheckboxProps(record) {
+    return {
+      // 角色员工列表的添加员工弹窗中 禁止添加选择已存在该角色的员工
+      disabled: originalRowKeyList.value.includes(record.employeeId),
+    };
+  }
+
   // ----------------------- 员工表格渲染 ---------------------
   const tableData = ref([]);
   //字段
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-employee-list/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-employee-list/index.vue
index c782e46c..e2dc08bf 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-employee-list/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-employee-list/index.vue
@@ -168,7 +168,7 @@
 
   async function addRoleEmployee() {
     let res = await roleApi.getRoleAllEmployee(selectRoleId.value);
-    let selectedIdList = res.data.map((e) => e.roleId) || [];
+    let selectedIdList = res.data.map((e) => e.employeeId) || [];
     selectEmployeeModal.value.showModal(selectedIdList);
   }
 

From 84b5d338b610df9933d1e3158f3a090139dc545c Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sun, 4 Aug 2024 15:37:44 +0800
Subject: [PATCH 11/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A1=E3=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=91=98=E5=B7=A5=E9=80=9A=E7=9F=A5=E6=97=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=8F=E8=A7=88=E9=87=8F=EF=BC=9B2?=
 =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84=20Notice?=
 =?UTF-8?q?Mapper.xml=20=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/oa/notice/dao/NoticeDao.java     | 10 +++
 .../notice/service/NoticeEmployeeService.java | 11 ++-
 .../employee/manager/EmployeeManager.java     |  7 +-
 .../mapper/business/notice/NoticeMapper.xml   | 69 -------------------
 .../{NoticeDao.xml => NoticeMapper.xml}       |  6 ++
 5 files changed, 30 insertions(+), 73 deletions(-)
 delete mode 100644 smart-admin-api/sa-admin/src/main/resources/mapper/business/notice/NoticeMapper.xml
 rename smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/{NoticeDao.xml => NoticeMapper.xml} (97%)

diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.java
index d6654a43..f6c5060f 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.java
@@ -114,4 +114,14 @@ public interface NoticeDao extends BaseMapper<NoticeEntity> {
      */
     void updateViewRecord(@Param("noticeId")Long noticeId, @Param("employeeId")Long requestEmployeeId,@Param("ip") String ip, @Param("userAgent")String userAgent);
 
+    /**
+     * 更新 浏览量
+     *
+     * @param noticeId 通知 id
+     * @param pageViewCountIncrement 页面浏览量的增量
+     * @param userViewCountIncrement 用户浏览量的增量
+     */
+    void updateViewCount(@Param("noticeId")Long noticeId,@Param("pageViewCountIncrement") Integer pageViewCountIncrement, @Param("userViewCountIncrement")Integer userViewCountIncrement);
+
+
 }
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java
index 5ac0f389..8208a74f 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java
@@ -52,10 +52,10 @@ public class NoticeEmployeeService {
     public ResponseDTO<PageResult<NoticeEmployeeVO>> queryList(Long requestEmployeeId, NoticeEmployeeQueryForm noticeEmployeeQueryForm) {
         Page<?> page = SmartPageUtil.convert2PageQuery(noticeEmployeeQueryForm);
 
-        //获取请求人的 部门及其子部门
         List<Long> employeeDepartmentIdList = Lists.newArrayList();
         EmployeeEntity employeeEntity = employeeService.getById(requestEmployeeId);
-        if (employeeEntity.getDepartmentId() != null) {
+        // 如果不是管理员 则获取请求人的 部门及其子部门
+        if (!employeeEntity.getAdministratorFlag() && employeeEntity.getDepartmentId() != null) {
             employeeDepartmentIdList = departmentService.selfAndChildrenIdList(employeeEntity.getDepartmentId());
         }
 
@@ -106,8 +106,15 @@ public class NoticeEmployeeService {
         long viewCount = noticeDao.viewRecordCount(noticeId, requestEmployeeId);
         if (viewCount == 0) {
             noticeDao.insertViewRecord(noticeId, requestEmployeeId, ip, userAgent, 1);
+            // 该员工对于这个通知是第一次查看 页面浏览量+1 用户浏览量+1
+            noticeDao.updateViewCount(noticeId, 1, 1);
+            noticeDetailVO.setPageViewCount(noticeDetailVO.getPageViewCount() + 1);
+            noticeDetailVO.setUserViewCount(noticeDetailVO.getUserViewCount() + 1);
         } else {
             noticeDao.updateViewRecord(noticeId, requestEmployeeId, ip, userAgent);
+            // 该员工对于这个通知不是第一次查看 页面浏览量+1 用户浏览量+0
+            noticeDao.updateViewCount(noticeId, 1, 0);
+            noticeDetailVO.setPageViewCount(noticeDetailVO.getPageViewCount() + 1);
         }
 
         return ResponseDTO.ok(noticeDetailVO);
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java
index 2aca93bb..3495107f 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java
@@ -60,8 +60,11 @@ public class EmployeeManager extends ServiceImpl<EmployeeDao, EmployeeEntity> {
         // 保存员工 获得id
         employeeDao.updateById(employee);
 
-        if (CollectionUtils.isNotEmpty(roleIdList)) {
-            List<RoleEmployeeEntity> roleEmployeeList = roleIdList.stream().map(e -> new RoleEmployeeEntity(e, employee.getEmployeeId())).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(roleIdList)) {
+            // 删除员工角色
+            this.updateEmployeeRole(employee.getEmployeeId(), null);
+        } else {
+            List<RoleEmployeeEntity> roleEmployeeList = roleIdList.stream().map(roleId -> new RoleEmployeeEntity(roleId, employee.getEmployeeId())).collect(Collectors.toList());
             this.updateEmployeeRole(employee.getEmployeeId(), roleEmployeeList);
         }
     }
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/business/notice/NoticeMapper.xml b/smart-admin-api/sa-admin/src/main/resources/mapper/business/notice/NoticeMapper.xml
deleted file mode 100644
index 580bb9b4..00000000
--- a/smart-admin-api/sa-admin/src/main/resources/mapper/business/notice/NoticeMapper.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.lab1024.sa.admin.module.business.notice.NoticeDao">
-    <update id="updateWatchAmount">
-        UPDATE t_notice
-        SET watch_amount = watch_amount + 1
-        WHERE notice_id = #{noticeId}
-    </update>
-    <update id="batchDeleteNotice">
-        UPDATE t_notice
-        SET deleted_flag = #{deletedFlag}
-        WHERE notice_id IN
-        <foreach collection="noticeIdList" open="(" close=")" separator="," item="item">
-            #{item}
-        </foreach>
-    </update>
-    <update id="updateNotice">
-        UPDATE t_notice
-        SET notice_type         = #{noticeType},
-            notice_belong_type  = #{noticeBelongType},
-            notice_title        = #{noticeTitle},
-            notice_content      = #{noticeContent},
-            link_address        = #{linkAddress},
-            cover_file_key      = #{coverFileKey},
-            accessory_file_keys = #{accessoryFileKeys},
-            top_flag            = #{topFlag},
-            publish_time        = #{publishTime},
-            disabled_flag       = #{disabledFlag}
-        WHERE notice_id = #{noticeId}
-    </update>
-    <select id="queryPage" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVO">
-        SELECT t_notice.*,
-        t_employee.actual_name AS createUserName
-        FROM t_notice
-        LEFT JOIN t_employee  ON t_notice.create_user_id = t_employee.employee_id
-        <where>
-            t_notice.deleted_flag = #{queryForm.deletedFlag}
-            <if test="queryForm.keywords != null and queryForm.keywords != ''">
-                AND (INSTR(t_notice.notice_title,#{queryForm.keywords}) OR INSTR(t_employee.actual_name,#{queryForm.keywords}))
-            </if>
-            <if test="queryForm.noticeType != null">
-                AND t_notice.notice_type = #{queryForm.noticeType}
-            </if>
-            <if test="queryForm.noticeBelongType != null">
-                AND t_notice.notice_belong_type = #{queryForm.noticeBelongType}
-            </if>
-            <if test="queryForm.startTime != null">
-                AND DATE_FORMAT(t_notice.publish_time, '%Y-%m-%d') &gt;= #{queryForm.startTime}
-            </if>
-            <if test="queryForm.endTime != null">
-                AND DATE_FORMAT(t_notice.publish_time, '%Y-%m-%d') &lt;= #{queryForm.endTime}
-            </if>
-            <if test="queryForm.disabledFlag != null">
-                AND t_notice.disabled_flag = #{queryForm.disabledFlag}
-            </if>
-        </where>
-        <if test="queryForm.sortItemList == null or queryForm.sortItemList.size == 0">
-            ORDER BY t_notice.top_flag DESC,t_notice.publish_time DESC
-        </if>
-    </select>
-    <select id="getDetail" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVO">
-        SELECT tn.*,
-               e.actual_name AS createUserName
-        FROM t_notice tn
-                 LEFT JOIN t_employee e ON tn.create_user_id = e.employee_id
-        WHERE tn.notice_id = #{noticeId}
-          AND tn.deleted_flag = #{deletedFlag}
-    </select>
-</mapper>
\ No newline at end of file
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/NoticeMapper.xml
similarity index 97%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeDao.xml
rename to smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml
index 7c623e33..b1dc8ad5 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/NoticeMapper.xml
@@ -242,5 +242,11 @@
         where notice_id = #{noticeId}
           and employee_id = #{employeeId}
     </update>
+    <update id="updateViewCount">
+        update t_notice
+        set page_view_count = page_view_count + #{pageViewCountIncrement},
+            user_view_count = user_view_count + #{userViewCountIncrement}
+        where notice_id = #{noticeId}
+    </update>
 
 </mapper>
\ No newline at end of file

From a5a7fdf61a975579a4971c88179006d91adb1a4c Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sun, 4 Aug 2024 20:24:50 +0800
Subject: [PATCH 12/22] Field 'execute_end_time' doesn't have a default value

---
 .../sa/base/module/support/job/core/SmartJobExecutor.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java
index c2508af9..de08bd32 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java
@@ -142,6 +142,7 @@ public class SmartJobExecutor implements Runnable {
         logEntity.setSuccessFlag(true);
         // 执行开始时间
         logEntity.setExecuteStartTime(executeTime);
+        logEntity.setExecuteTimeMillis(0L);
         logEntity.setCreateName(executorName);
         logEntity.setIp(SmartIpUtil.getLocalFirstIp());
         logEntity.setProcessId(SmartJobUtil.getProcessId());

From a1043083dc472a65453f9011c94cafc4be7f90ff Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sun, 4 Aug 2024 21:51:40 +0800
Subject: [PATCH 13/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E5=9D=97=EF=BC=9A1=E3=80=81?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E4=B8=8E=E6=96=87=E4=BB=B6=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=8F=E5=88=97=E5=8C=96=E6=B3=A8=E8=A7=A3?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81=E6=96=B0=E5=A2=9E=20bit-Boolean=20=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=E6=98=A0=E5=B0=84=EF=BC=9B=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=9C=A8create=5Ftime=E4=B8=8Eupdate=5Ftime=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=B8=8A=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sa/base/config/DataSourceConfig.java      |   4 +
 .../lab1024/sa/base/config/RedisConfig.java   |   4 +-
 .../base/handler/MybatisPlusFillHandler.java  |  40 ++++++
 .../constant/CodeFrontComponentEnum.java      |   2 +-
 .../domain/form/CodeGeneratorConfigForm.java  |   1 -
 .../model/CodeInsertAndUpdateField.java       |   4 +-
 .../service/CodeGeneratorTemplateService.java |   1 +
 .../CodeGenerateBaseVariableService.java      |  45 +++----
 .../domain/AddFormVariableService.java        |   4 +-
 .../backend/domain/EntityVariableService.java |  13 +-
 .../backend/domain/MapperVariableService.java |  57 +++------
 .../domain/QueryFormVariableService.java      |   6 +-
 .../domain/UpdateFormVariableService.java     |   7 +-
 .../backend/domain/VOVariableService.java     |  14 +-
 .../java/constant/enum.java.vm                |   1 +
 .../java/dao/Dao.java.vm                      |   7 +-
 .../java/domain/entity/Entity.java.vm         |  16 ++-
 .../java/domain/form/QueryForm.java.vm        |   5 +-
 .../java/domain/vo/VO.java.vm                 |  10 +-
 .../java/mapper/Mapper.xml.vm                 |  29 ++---
 .../java/service/Service.java.vm              |   4 +-
 .../code-generator-template/js/form.vue.vm    | 121 +++++++++---------
 .../code-generator-template/js/list.vue.vm    |  41 +++---
 .../code-generator/code-generator-util.js     |   8 +-
 ...ode-generator-table-config-form-delete.vue |   5 +-
 .../form/code-generator-table-config-form.vue |   6 +-
 .../preview/code-generator-preview-modal.vue  |  24 ++--
 27 files changed, 255 insertions(+), 224 deletions(-)
 create mode 100644 smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/handler/MybatisPlusFillHandler.java

diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java
index 4fb6945e..f1eea694 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java
@@ -7,10 +7,12 @@ import com.alibaba.druid.support.http.StatViewServlet;
 import com.alibaba.druid.support.http.WebStatFilter;
 import com.alibaba.druid.support.spring.stat.DruidStatInterceptor;
 import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.base.common.domain.DataScopePlugin;
+import net.lab1024.sa.base.handler.MybatisPlusFillHandler;
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
@@ -144,6 +146,8 @@ public class DataSourceConfig {
             pluginsList.add(dataScopePlugin);
         }
         factoryBean.setPlugins(pluginsList.toArray(new Interceptor[pluginsList.size()]));
+        // 添加字段自动填充处理
+        factoryBean.setGlobalConfig(new GlobalConfig().setBanner(false).setMetaObjectHandler(new MybatisPlusFillHandler()));
 
         return factoryBean.getObject();
     }
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java
index f6616e46..24a14773 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -43,7 +44,8 @@ public class RedisConfig {
                 .setSerializationInclusion(JsonInclude.Include.NON_NULL);
 
         om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        // enableDefaultTyping 官方已弃用 所以改为 activateDefaultTyping
+        om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
         jackson2JsonRedisSerializer.setObjectMapper(om);
         RedisTemplate<String, Object> template = new RedisTemplate<>();
         template.setConnectionFactory(factory);
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/handler/MybatisPlusFillHandler.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/handler/MybatisPlusFillHandler.java
new file mode 100644
index 00000000..372ff757
--- /dev/null
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/handler/MybatisPlusFillHandler.java
@@ -0,0 +1,40 @@
+package net.lab1024.sa.base.handler;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * Mybatis Plus 插入或者更新时指定字段设置值
+ *
+ * @author zhoumingfa
+ */
+@Component
+@Slf4j
+public class MybatisPlusFillHandler implements MetaObjectHandler {
+
+    public static final String CREATE_TIME = "createTime";
+
+    public static final String UPDATE_TIME = "updateTime";
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        if (metaObject.hasSetter(CREATE_TIME)) {
+            this.fillStrategy(metaObject, CREATE_TIME, LocalDateTime.now());
+        }
+        if (metaObject.hasSetter(UPDATE_TIME)) {
+            this.fillStrategy(metaObject, UPDATE_TIME, LocalDateTime.now());
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        if (metaObject.hasSetter(UPDATE_TIME)) {
+            this.fillStrategy(metaObject, UPDATE_TIME, LocalDateTime.now());
+        }
+    }
+
+}
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeFrontComponentEnum.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeFrontComponentEnum.java
index 5358806c..10c8779e 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeFrontComponentEnum.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeFrontComponentEnum.java
@@ -41,7 +41,7 @@ public enum CodeFrontComponentEnum implements BaseEnum {
     }
 
     @Override
-    public Object getValue() {
+    public String getValue() {
         return value;
     }
 
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java
index 10170b00..4e3c0398 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java
@@ -32,7 +32,6 @@ public class CodeGeneratorConfigForm {
     @Schema(description = "表名")
     private String tableName;
 
-
     @Valid
     @NotNull(message = "基础信息不能为空")
     @Schema(description = "基础信息")
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java
index db623864..5e83fd5d 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java
@@ -39,8 +39,8 @@ public class CodeInsertAndUpdateField {
     @Schema(description = "更新标识")
     private Boolean updateFlag;
 
-    @SchemaEnum(value = CodeGeneratorPageTypeEnum.class)
-    @CheckEnum(value = CodeFrontComponentEnum.class, message = "3.增加、修改  增加、修改 组件类型 枚举值错误", required = true)
+    @SchemaEnum(value = CodeFrontComponentEnum.class)
+    @CheckEnum(value = CodeFrontComponentEnum.class, message = "3.增加、修改 组件类型 枚举值错误", required = true)
     private String frontComponent;
 
 }
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
index 5161f0bb..ecad0c44 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
@@ -94,6 +94,7 @@ public class CodeGeneratorTemplateService {
                 String fileName = templateFile.startsWith("java") ? upperCamel + templateSplit[templateSplit.length - 1] : lowerHyphen + "-" + templateSplit[templateSplit.length - 1];
                 String fullPathFileName = templateFile.replaceAll(templateSplit[templateSplit.length - 1], fileName);
                 fullPathFileName = fullPathFileName.replaceAll("java/", "java/" + basic.getModuleName().toLowerCase() + "/");
+                fullPathFileName = fullPathFileName.replaceAll("js/", "js/" + basic.getModuleName().toLowerCase() + "/");
 
                 String fileContent = generate(tableName, templateFile, codeGeneratorConfigEntity);
                 File file = new File(uuid + "/" + fullPathFileName);
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
index 9602aeae..d39bf6bf 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
@@ -2,6 +2,7 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable;
 
 import com.google.common.base.CaseFormat;
 import net.lab1024.sa.base.common.util.SmartStringUtil;
+import net.lab1024.sa.base.module.support.codegenerator.constant.CodeFrontComponentEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdate;
@@ -17,7 +18,7 @@ import java.util.stream.Collectors;
  * @Date 2022/9/29 17:20:41
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 public abstract class CodeGenerateBaseVariableService {
 
@@ -43,13 +44,13 @@ public abstract class CodeGenerateBaseVariableService {
         String upperCamelName = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_CAMEL, form.getBasic().getModuleName());
         ArrayList<String> list = new ArrayList<>();
 
-        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.entity." + upperCamelName + "Entity;" );
+        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.entity." + upperCamelName + "Entity;");
 
-        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.form." + upperCamelName + "AddForm;" );
-        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.form." + upperCamelName + "UpdateForm;" );
-        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.form." + upperCamelName + "QueryForm;" );
+        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.form." + upperCamelName + "AddForm;");
+        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.form." + upperCamelName + "UpdateForm;");
+        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.form." + upperCamelName + "QueryForm;");
 
-        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.vo." + upperCamelName + "VO;" );
+        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.vo." + upperCamelName + "VO;");
         return list;
     }
 
@@ -88,43 +89,33 @@ public abstract class CodeGenerateBaseVariableService {
         }
 
         CodeInsertAndUpdateField field = first.get();
-        return SmartStringUtil.contains(field.getFrontComponent(), "Upload" );
+        return SmartStringUtil.equals(field.getFrontComponent(), CodeFrontComponentEnum.FILE_UPLOAD.getValue());
     }
 
     /**
-     * 是否为 枚举
+     * 是否为 字典
      */
     protected boolean isDict(String columnName, CodeGeneratorConfigForm form) {
-        List<CodeField> fields = form.getFields();
-        if (CollectionUtils.isEmpty(fields)) {
-            return false;
-        }
-
-        Optional<CodeField> first = fields.stream().filter(e -> columnName.equals(e.getColumnName())).findFirst();
-        if (first.isPresent()) {
-            return false;
-        }
-
-        CodeField codeField = first.get();
-        return codeField.getDict() != null;
+        CodeField codeField = getCodeField(columnName, form);
+        return codeField != null && codeField.getDict() != null;
     }
 
     /**
      * 是否为 枚举
      */
     protected boolean isEnum(String columnName, CodeGeneratorConfigForm form) {
+        CodeField codeField = getCodeField(columnName, form);
+        return codeField != null && codeField.getEnumName() != null;
+    }
+
+    private CodeField getCodeField(String columnName, CodeGeneratorConfigForm form) {
         List<CodeField> fields = form.getFields();
         if (CollectionUtils.isEmpty(fields)) {
-            return false;
+            return null;
         }
 
         Optional<CodeField> first = fields.stream().filter(e -> columnName.equals(e.getColumnName())).findFirst();
-        if (first.isPresent()) {
-            return false;
-        }
-
-        CodeField codeField = first.get();
-        return codeField.getEnumName() != null;
+        return first.orElse(null);
     }
 
     /**
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java
index 0d2e13fc..1d29259a 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java
@@ -2,6 +2,7 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable.backen
 
 import cn.hutool.core.bean.BeanUtil;
 import net.lab1024.sa.base.common.util.SmartStringUtil;
+import net.lab1024.sa.base.module.support.codegenerator.constant.CodeFrontComponentEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdate;
@@ -100,7 +101,6 @@ public class AddFormVariableService extends CodeGenerateBaseVariableService {
                 }
             }
 
-
             //字典
             if (SmartStringUtil.isNotEmpty(codeField.getDict())) {
                 finalFieldMap.put("dict", "\n    @JsonDeserialize(using = DictValueVoDeserializer.class)");
@@ -109,7 +109,7 @@ public class AddFormVariableService extends CodeGenerateBaseVariableService {
             }
 
             //文件上传
-            if (SmartStringUtil.contains(field.getFrontComponent(), "Upload")) {
+            if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent())) {
                 finalFieldMap.put("file", "\n    @JsonDeserialize(using = FileKeyVoDeserializer.class)");
                 packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
                 packageList.add("import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;");
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/EntityVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/EntityVariableService.java
index 59a3fa86..391bffa4 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/EntityVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/EntityVariableService.java
@@ -14,7 +14,7 @@ import java.util.stream.Collectors;
  * @Date 2022/9/29 17:20:41
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 
 public class EntityVariableService extends CodeGenerateBaseVariableService {
@@ -54,14 +54,21 @@ public class EntityVariableService extends CodeGenerateBaseVariableService {
         // mybatis plus
         result.add("import com.baomidou.mybatisplus.annotation.TableName;");
 
+        // 自动填充注解
+        boolean existCreateAndUpdate = fields.stream().anyMatch(e -> "create_time".equals(e.getColumnName()) || "update_time".equals(e.getColumnName()));
+        if (existCreateAndUpdate) {
+            result.add("import com.baomidou.mybatisplus.annotation.FieldFill;");
+            result.add("import com.baomidou.mybatisplus.annotation.TableField;");
+        }
+
         //主键
-        boolean isExistPrimaryKey = fields.stream().filter(e -> e.getPrimaryKeyFlag() != null && e.getPrimaryKeyFlag()).findFirst().isPresent();
+        boolean isExistPrimaryKey = fields.stream().anyMatch(e -> e.getPrimaryKeyFlag() != null && e.getPrimaryKeyFlag());
         if (isExistPrimaryKey) {
             result.add("import com.baomidou.mybatisplus.annotation.TableId;");
         }
 
         //自增
-        boolean isExistAutoIncrease = fields.stream().filter(e -> e.getAutoIncreaseFlag() != null && e.getAutoIncreaseFlag()).findFirst().isPresent();
+        boolean isExistAutoIncrease = fields.stream().anyMatch(e -> e.getAutoIncreaseFlag() != null && e.getAutoIncreaseFlag());
         if (isExistAutoIncrease) {
             result.add("import com.baomidou.mybatisplus.annotation.IdType;");
         }
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java
index 1be48fc6..c6371d98 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java
@@ -3,19 +3,20 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable.backen
 import cn.hutool.core.bean.BeanUtil;
 import net.lab1024.sa.base.module.support.codegenerator.constant.CodeQueryFieldQueryTypeEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
-import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdateField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeQueryField;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
-import org.apache.commons.collections4.CollectionUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Author 1024创新实验室-主任:卓大
  * @Date 2022/9/29 17:20:41
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 
 public class MapperVariableService extends CodeGenerateBaseVariableService {
@@ -39,55 +40,39 @@ public class MapperVariableService extends CodeGenerateBaseVariableService {
                 List<String> columnNameList = queryField.getColumnNameList();
                 if (columnNameList.size() == 1) {
                     // AND INSTR(t_notice.title,#{query.keywords})
-                    stringBuilder.append("        AND INSTR(" )
-                            .append(form.getTableName()).append("." ).append(queryField.getColumnNameList().get(0))
-                            .append(",#{queryForm." )
+                    stringBuilder.append("        AND INSTR(")
+                            .append(form.getTableName()).append(".").append(queryField.getColumnNameList().get(0))
+                            .append(",#{queryForm.")
                             .append(queryField.getFieldName())
-                            .append("})" );
+                            .append("})");
                 } else {
                     for (int i = 0; i < columnNameList.size(); i++) {
                         if (i == 0) {
-                            stringBuilder.append("AND ( INSTR(" )
-                                    .append(form.getTableName()).append("." ).append(queryField.getColumnNameList().get(i))
-                                    .append(",#{queryForm." )
+                            stringBuilder.append("AND ( INSTR(")
+                                    .append(form.getTableName()).append(".").append(queryField.getColumnNameList().get(i))
+                                    .append(",#{queryForm.")
                                     .append(queryField.getFieldName())
-                                    .append("})" );
+                                    .append("})");
                         } else {
                             // OR INSTR(t_notice.author,#{query.keywords})
-                            stringBuilder.append("\n                OR INSTR(" )
-                                    .append(form.getTableName()).append("." ).append(queryField.getColumnNameList().get(i))
-                                    .append(",#{queryForm." )
+                            stringBuilder.append("\n                OR INSTR(")
+                                    .append(form.getTableName()).append(".").append(queryField.getColumnNameList().get(i))
+                                    .append(",#{queryForm.")
                                     .append(queryField.getFieldName())
-                                    .append("})" );
+                                    .append("})");
                         }
                     }
-                    stringBuilder.append("\n            )" );
+                    stringBuilder.append("\n            )");
                 }
                 fieldMap.put("likeStr", stringBuilder.toString());
-            }else{
-                fieldMap.put("columnName",queryField.getColumnNameList().get(0));
+            } else {
+                fieldMap.put("columnName", queryField.getColumnNameList().get(0));
             }
         }
 
         variablesMap.put("queryFields", finalQueryFiledList);
-        variablesMap.put("daoClassName", form.getBasic().getJavaPackageName() + ".dao." + form.getBasic().getModuleName() + "Dao" );
+        variablesMap.put("daoClassName", form.getBasic().getJavaPackageName() + ".dao." + form.getBasic().getModuleName() + "Dao");
         return variablesMap;
     }
 
-
-    public List<String> getPackageList(List<CodeInsertAndUpdateField> fields, CodeGeneratorConfigForm form) {
-        if (CollectionUtils.isEmpty(fields)) {
-            return new ArrayList<>();
-        }
-
-        HashSet<String> packageList = new HashSet<>();
-
-        //1、javabean相关的包
-        packageList.addAll(getJavaBeanImportClass(form));
-
-        //2、dao
-        packageList.add("import " + form.getBasic().getJavaPackageName() + ".dao." + form.getBasic().getModuleName() + "Dao;" );
-        return new ArrayList<>(packageList);
-    }
-
 }
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java
index 2c513790..24d74e5d 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java
@@ -18,7 +18,7 @@ import java.util.stream.Collectors;
  * @Date 2022/9/29 17:20:41
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 
 public class QueryFormVariableService extends CodeGenerateBaseVariableService {
@@ -75,9 +75,6 @@ public class QueryFormVariableService extends CodeGenerateBaseVariableService {
             CodeField codeField = null;
 
             switch (queryTypeEnum) {
-                case LIKE:
-                    finalFieldMap.put("javaType", "String");
-                    break;
                 case EQUAL:
                     codeField = getCodeFieldByColumnName(field.getColumnNameList().get(0), form);
                     if (codeField == null) {
@@ -119,6 +116,7 @@ public class QueryFormVariableService extends CodeGenerateBaseVariableService {
 
         // lombok
         packageList.add("import lombok.Data;");
+        packageList.add("import lombok.EqualsAndHashCode;");
 
         List<String> packageNameList = packageList.stream().filter(Objects::nonNull).collect(Collectors.toList());
         Collections.sort(packageNameList);
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java
index 89bb5a18..004e7670 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java
@@ -2,6 +2,7 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable.backen
 
 import cn.hutool.core.bean.BeanUtil;
 import net.lab1024.sa.base.common.util.SmartStringUtil;
+import net.lab1024.sa.base.module.support.codegenerator.constant.CodeFrontComponentEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdate;
@@ -18,7 +19,7 @@ import java.util.stream.Collectors;
  * @Date 2022/9/29 17:20:41
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 
 public class UpdateFormVariableService extends CodeGenerateBaseVariableService {
@@ -42,7 +43,7 @@ public class UpdateFormVariableService extends CodeGenerateBaseVariableService {
                         return false;
                     }
 
-                    if(Boolean.TRUE.equals(codeField.getPrimaryKeyFlag())){
+                    if (Boolean.TRUE.equals(codeField.getPrimaryKeyFlag())) {
                         e.setRequiredFlag(true);
                     }
 
@@ -123,7 +124,7 @@ public class UpdateFormVariableService extends CodeGenerateBaseVariableService {
             }
 
             //文件上传
-            if (SmartStringUtil.contains(field.getFrontComponent(), "Upload")) {
+            if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent())) {
                 finalFieldMap.put("file", "\n    @JsonDeserialize(using = FileKeyVoDeserializer.class)");
                 packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
                 packageList.add("import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;");
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
index fceef52a..cde09227 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
@@ -17,7 +17,7 @@ import java.util.stream.Collectors;
  * @Date 2022/9/29 17:20:41
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 
 public class VOVariableService extends CodeGenerateBaseVariableService {
@@ -87,16 +87,16 @@ public class VOVariableService extends CodeGenerateBaseVariableService {
 
             //字典
             if (isDict(field.getColumnName(), form)) {
-                finalFieldMap.put("dict", "\n    @JsonDeserialize(using = DictValueVoDeserializer.class)");
-                packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
-                packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;");
+                finalFieldMap.put("dict", "\n    @JsonSerialize(using = DictValueVoSerializer.class)");
+                packageList.add("import com.fasterxml.jackson.databind.annotation.JsonSerialize;");
+                packageList.add("import net.lab1024.sa.base.common.json.serializer.DictValueVoSerializer;");
             }
 
             //文件上传
             if (isFile(field.getColumnName(), form)) {
-                finalFieldMap.put("file", "\n    @JsonDeserialize(using = FileKeyVoDeserializer.class)");
-                packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
-                packageList.add("import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;");
+                finalFieldMap.put("file", "\n    @JsonSerialize(using = FileKeyVoSerializer.class)");
+                packageList.add("import com.fasterxml.jackson.databind.annotation.JsonSerialize;");
+                packageList.add("import net.lab1024.sa.base.common.json.serializer.FileKeyVoSerializer;");
             }
 
             packageList.add(getJavaPackageName(codeField.getJavaType()));
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/constant/enum.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/constant/enum.java.vm
index e67215ae..87c2c644 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/constant/enum.java.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/constant/enum.java.vm
@@ -2,6 +2,7 @@ package ${packageName};
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import net.lab1024.sa.base.common.enumeration.BaseEnum;
 
 /**
  * ${enumDesc}
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm
index b14411a9..938b758e 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm
@@ -38,14 +38,15 @@ public interface ${name.upperCamel}Dao extends BaseMapper<${name.upperCamel}Enti
      * 更新删除状态
      */
     long updateDeleted(@Param("${primaryKeyFieldName}")${primaryKeyJavaType} ${primaryKeyFieldName},@Param("${deletedFlag}")boolean deletedFlag);
+
 #end
 #if($deleteInfo.deleteEnum == "Batch" || $deleteInfo.deleteEnum == "SingleAndBatch")
     /**
      * 批量更新删除状态
      */
     void batchUpdateDeleted(@Param("idList")List<${primaryKeyJavaType}> idList,@Param("${deletedFlag}")boolean deletedFlag);
-#end
-#end
-#end
 
+#end
+#end
+#end
 }
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
index dd1fe0bb..04230b36 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
@@ -20,13 +20,19 @@ public class ${name.upperCamel}Entity {
     /**
      * $field.label
      */
-#if($field.primaryKeyFlag && $field.autoIncreaseFlag)
+    #if($field.primaryKeyFlag && $field.autoIncreaseFlag)
     @TableId(type = IdType.AUTO)
-#end
-#if($field.primaryKeyFlag && !$field.autoIncreaseFlag)
+    #end
+    #if($field.primaryKeyFlag && !$field.autoIncreaseFlag)
     @TableId
-#end
+    #end
+    #if($field.columnName == "create_time")
+    @TableField(fill = FieldFill.INSERT)
+    #end
+    #if($field.columnName == "update_time")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    #end
     private $field.javaType $field.fieldName;
 #end
 
-}
\ No newline at end of file
+}
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/form/QueryForm.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/form/QueryForm.java.vm
index ba764981..69a247e2 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/form/QueryForm.java.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/form/QueryForm.java.vm
@@ -14,7 +14,8 @@ $importClass
  */
 
 @Data
-public class ${name.upperCamel}QueryForm extends PageParam{
+@EqualsAndHashCode(callSuper = false)
+public class ${name.upperCamel}QueryForm extends PageParam {
 #foreach ($field in $fields)
 
 #if($field.isEnum)
@@ -35,4 +36,4 @@ public class ${name.upperCamel}QueryForm extends PageParam{
 #end
 #end
 
-}
\ No newline at end of file
+}
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
index 88aed8b3..4a84efd0 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
@@ -17,14 +17,8 @@ public class ${name.upperCamel}VO {
 
 #foreach ($field in $fields)
 
-#if($field.isEnum)
-    ${field.apiModelProperty}
+    ${field.apiModelProperty}$!{field.notEmpty}$!{field.dict}$!{field.file}
     private $field.javaType $field.fieldName;
 #end
-#if(!$field.isEnum)
-    ${field.apiModelProperty}$!{field.dict}$!{field.file}
-    private $field.javaType $field.fieldName;
-#end
-#end
 
-}
\ No newline at end of file
+}
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm
index d6809423..0a205951 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm
@@ -2,10 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="${daoClassName}">
 
+    <!-- 查询结果列 -->
+    <sql id="base_columns">
+        #foreach ($field in $fields)
+        ${tableName}.${field.columnName}#if($foreach.hasNext),#end
+        #end
+    </sql>
+
     <!-- 分页查询 -->
     <select id="queryPage" resultType="${basic.javaPackageName}.domain.vo.${name.upperCamel}VO">
         SELECT
-        *
+        <include refid="base_columns"/>
         FROM ${tableName}
 #if($queryFields.size() > 0)
         <where>
@@ -23,15 +30,15 @@
 #end
 #if(${queryField.queryTypeEnum} == "Date")
             <if test="queryForm.${queryField.fieldName} != null">
-                AND DATE_FORMAT(${tableName}.${queryField.columnName}, '%Y-%m-%d') = #{queryForm.${queryField.fieldName}}
+                AND ${tableName}.${queryField.columnName} = #{queryForm.${queryField.fieldName}}
             </if>
 #end
 #if(${queryField.queryTypeEnum} == "DateRange")
             <if test="queryForm.${queryField.fieldName}Begin != null">
-                AND DATE_FORMAT(${tableName}.${queryField.columnName}, '%Y-%m-%d') &gt;= #{queryForm.${queryField.fieldName}Begin}
+                AND ${tableName}.${queryField.columnName} &gt;= #{queryForm.${queryField.fieldName}Begin}
             </if>
             <if test="queryForm.${queryField.fieldName}End != null">
-                AND DATE_FORMAT(${tableName}.${queryField.columnName}, '%Y-%m-%d') &lt;= #{queryForm.${queryField.fieldName}End}
+                AND ${tableName}.${queryField.columnName} &lt;= #{queryForm.${queryField.fieldName}End}
             </if>
 #end
 #end
@@ -39,21 +46,10 @@
 #end
     </select>
 
-#if($dao.deletedFieldUpperName != $null)
-    <update id="batchUpdate${dao.deletedFieldUpperName}">
-        update ${mapper.tableName} set ${mapper.deletedColumnName} = #{deletedFlag}
-        where ${mapper.mainKeyColumnName} in
-        <foreach collection="idList" open="(" close=")" separator="," item="item">
-            #{item}
-        </foreach>
-    </update>
-#end
-
 #if($deleteInfo.isSupportDelete)
 ### 假删除
 #if(!${deleteInfo.isPhysicallyDeleted})
 #if($deleteInfo.deleteEnum == "Batch" || $deleteInfo.deleteEnum == "SingleAndBatch")
-
     <update id="batchUpdateDeleted">
         update ${tableName} set deleted_flag = #{deletedFlag}
         where ${primaryKeyColumnName} in
@@ -71,4 +67,5 @@
 #end
 #end
 #end
-</mapper>
\ No newline at end of file
+
+</mapper>
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm
index 923e6e06..3be777d5 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm
@@ -64,7 +64,7 @@ public class ${name.upperCamel}Service {
 #end
 
 #if($deleteInfo.isSupportDelete)
-    #if($deleteInfo.deleteEnum == "BATCH" || $deleteInfo.deleteEnum == "SingleAndBatch")
+    #if($deleteInfo.deleteEnum == "Batch" || $deleteInfo.deleteEnum == "SingleAndBatch")
     /**
      * 批量删除
      *
@@ -97,7 +97,7 @@ public class ${name.upperCamel}Service {
 
 ### 真删除 or 假删除
 #if(!${deleteInfo.isPhysicallyDeleted})
-        ${name.lowerCamel}Dao.updateDeleted(${primaryKeyFieldName},true);
+        ${name.lowerCamel}Dao.updateDeleted(${primaryKeyFieldName}, true);
 #end
 #if(${deleteInfo.isPhysicallyDeleted})
         ${name.lowerCamel}Dao.deleteById(${primaryKeyFieldName});
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
index 1de462cd..ea0b2d1d 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
@@ -21,59 +21,59 @@
     <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" >
         #if($insertAndUpdate.countPerLine == 1)
           <a-row>
-              #foreach ($field in $formFields)
-                  #if($field.frontComponent == "Input")
-                    <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                      <a-input style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "InputNumber")
-                    <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                      <a-input-number style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "Textarea")
-                    <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                      <a-textarea style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "BooleanSelect")
-                    <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                      <BooleanSelect v-model:value="form.${field.fieldName}" style="width: 100%" />
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "SmartEnumSelect")
-                    <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-                      <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "DictSelect")
-                    <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-                      <DictSelect width="100%" v-model:value="form.${field.fieldName}" keyCode="$!{field.dict}" placeholder="$!{field.label}"/>
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "Date")
-                    <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                      <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}"/>
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "DateTime")
-                    <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                      <a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "Upload")
-                    <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                      <FileUpload
-                          :defaultFileList="form.$!{field.fieldName}"
-                          :folder="FILE_FOLDER_TYPE_ENUM.COMMON.value"
-                          buttonText="上传 $!{field.label}"
-                          listType="text"
-                          @change="e => form.$!{field.fieldName} = e"
-                      />
-                    </a-form-item>
-                  #end
+          #foreach ($field in $formFields)
+              #if($field.frontComponent == "Input")
+                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+                  <a-input style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
+                </a-form-item>
               #end
+              #if($field.frontComponent == "InputNumber")
+                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+                  <a-input-number style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
+                </a-form-item>
+              #end
+              #if($field.frontComponent == "Textarea")
+                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+                  <a-textarea style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
+                </a-form-item>
+              #end
+              #if($field.frontComponent == "BooleanSelect")
+                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+                  <BooleanSelect v-model:value="form.${field.fieldName}" style="width: 100%" />
+                </a-form-item>
+              #end
+              #if($field.frontComponent == "SmartEnumSelect")
+                <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
+                  <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
+                </a-form-item>
+              #end
+              #if($field.frontComponent == "DictSelect")
+                <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
+                  <DictSelect width="100%" v-model:value="form.${field.fieldName}" keyCode="$!{field.dict}" placeholder="$!{field.label}"/>
+                </a-form-item>
+              #end
+              #if($field.frontComponent == "Date")
+                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+                  <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}"/>
+                </a-form-item>
+              #end
+              #if($field.frontComponent == "DateTime")
+                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+                  <a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
+                </a-form-item>
+              #end
+              #if($field.frontComponent == "FileUpload")
+                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+                  <FileUpload
+                      :defaultFileList="form.$!{field.fieldName}"
+                      :folder="FILE_FOLDER_TYPE_ENUM.COMMON.value"
+                      buttonText="上传 $!{field.label}"
+                      listType="text"
+                      @change="e => form.$!{field.fieldName} = e"
+                  />
+                </a-form-item>
+              #end
+          #end
           </a-row>
         #end
 
@@ -122,7 +122,7 @@
                         <a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
                       </a-form-item>
                     #end
-                    #if($field.frontComponent == "Upload")
+                    #if($field.frontComponent == "FileUpload")
                       <a-form-item label="$!{field.label}"  name="${field.fieldName}">
                         <FileUpload
                             :defaultFileList="form.$!{field.fieldName}"
@@ -154,9 +154,9 @@
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { $!{name.lowerCamel}Api } from '/@/api/business/$!{name.lowerHyphenCamel}/$!{name.lowerHyphenCamel}-api';
   import { smartSentry } from '/@/lib/smart-sentry';
-      #foreach ($import in $frontImportList)
-          $!{import}
-      #end
+  #foreach ($import in $frontImportList)
+  $!{import}
+  #end
 
   // ------------------------ 事件 ------------------------
 
@@ -188,9 +188,8 @@
   const formRef = ref();
 
   const formDefault = {
-          $!{primaryKeyFieldName}: undefined,
       #foreach ($field in $formFields)
-              $!{field.fieldName}: undefined, //$!{field.label}
+      $!{field.fieldName}: undefined, //$!{field.label}
       #end
   };
 
@@ -198,9 +197,9 @@
 
   const rules = {
       #foreach ($field in $formFields)
-          #if($field.requiredFlag)
-                  $!{field.fieldName}: [{ required: true, message: '$!{field.label} 必填' }],
-          #end
+      #if($field.requiredFlag)
+      $!{field.fieldName}: [{ required: true, message: '$!{field.label} 必填' }],
+      #end
       #end
   };
 
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
index a4ca4d4f..15367104 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
@@ -88,18 +88,18 @@
 
         <!---------- 表格 begin ----------->
         <a-table
-                size="small"
-                :dataSource="tableData"
-                :columns="columns"
-                rowKey="$!{primaryKeyFieldName}"
-                bordered
-                :loading="tableLoading"
-                :pagination="false"
+            size="small"
+            :dataSource="tableData"
+            :columns="columns"
+            rowKey="$!{primaryKeyFieldName}"
+            bordered
+            :loading="tableLoading"
+            :pagination="false"
 #if($deleteInfo.isSupportDelete && ($deleteInfo.deleteEnum == "Batch"||$deleteInfo.deleteEnum == "SingleAndBatch"))
-                :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
+            :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
 #end
         >
-            <template #bodyCell="{ text, record, column }">
+            <template #bodyCell="{ record, column }">
                 <template v-if="column.dataIndex === 'action'">
                     <div class="smart-table-operate">
 #if($insertAndUpdate.isSupportInsertAndUpdate)
@@ -116,17 +116,17 @@
 
         <div class="smart-query-table-page">
             <a-pagination
-                    showSizeChanger
-                    showQuickJumper
-                    show-less-items
-                    :pageSizeOptions="PAGE_SIZE_OPTIONS"
-                    :defaultPageSize="queryForm.pageSize"
-                    v-model:current="queryForm.pageNum"
-                    v-model:pageSize="queryForm.pageSize"
-                    :total="total"
-                    @change="queryData"
-                    @showSizeChange="queryData"
-                    :show-total="(total) => `共${total}条`"
+                showSizeChanger
+                showQuickJumper
+                show-less-items
+                :pageSizeOptions="PAGE_SIZE_OPTIONS"
+                :defaultPageSize="queryForm.pageSize"
+                v-model:current="queryForm.pageNum"
+                v-model:pageSize="queryForm.pageSize"
+                :total="total"
+                @change="queryData"
+                @showSizeChange="queryData"
+                :show-total="(total) => `共${total}条`"
             />
         </div>
 
@@ -145,6 +145,7 @@
 #foreach ($import in $frontImportList)
     $!{import}
 #end
+
     // ---------------------------- 表格列 ----------------------------
 
     const columns = ref([
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js
index 8c1385a7..555d4457 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js
@@ -2,6 +2,7 @@ import { convertUpperCamel } from '/@/utils/str-util';
 
 // -------------------------------- java 类型 --------------------------------
 export const JavaTypeMap = new Map();
+JavaTypeMap.set('bit', 'Boolean');
 JavaTypeMap.set('int', 'Integer');
 JavaTypeMap.set('tinyint', 'Integer');
 JavaTypeMap.set('smallint', 'Integer');
@@ -37,6 +38,7 @@ export function getJavaType(dataType) {
 
 // -------------------------------- js 类型 --------------------------------
 export const JsTypeMap = new Map();
+JsTypeMap.set('bit', 'Boolean');
 JsTypeMap.set('int', 'Number');
 JsTypeMap.set('tinyint', 'Number');
 JsTypeMap.set('smallint', 'Number');
@@ -56,11 +58,10 @@ JsTypeMap.set('date', 'Date');
 JsTypeMap.set('datetime', 'Date');
 
 export const JsTypeList = [
+  'Boolean', //
   'Number', //
   'String', //
   'Date', //
-  'Boolean', //
-  'String', //
 ];
 
 export function getJsType(dataType) {
@@ -70,8 +71,9 @@ export function getJsType(dataType) {
 // -------------------------------- 前端组件 --------------------------------
 
 export const FrontComponentMap = new Map();
+FrontComponentMap.set('bit', 'BooleanSelect');
 FrontComponentMap.set('int', 'InputNumber');
-FrontComponentMap.set('tinyint', 'BooleanSelect');
+FrontComponentMap.set('tinyint', 'InputNumber');
 FrontComponentMap.set('smallint', 'InputNumber');
 FrontComponentMap.set('integer', 'InputNumber');
 FrontComponentMap.set('year', 'Date');
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
index 6ce3c30d..b289780e 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
@@ -68,11 +68,12 @@
     if (deletedFlagColumn) {
       deleteFlagColumnName.value = deletedFlagColumn.columnName;
     }
+    console.log(deletedFlagColumn);
 
     //表单
-    let deleteInfo = config.delete;
+    let deleteInfo = config.deleteInfo;
 
-    formData.isSupportDelete = deleteInfo && deleteInfo.isSupportDelete ? deleteInfo.isSupportDelete : true;
+    formData.isSupportDelete = deleteInfo && deleteInfo.isSupportDelete;
     formData.isPhysicallyDeleted = deleteInfo && deleteInfo.isPhysicallyDeleted ? deleteInfo.isPhysicallyDeleted : !deletedFlagColumn;
     formData.deleteEnum = deleteInfo && deleteInfo.deleteEnum ? deleteInfo.deleteEnum : CODE_DELETE_ENUM.SINGLE_AND_BATCH.value;
   }
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
index cc9b767b..9a2e8ada 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
@@ -12,7 +12,7 @@
     title="代码配置"
     style=""
     :open="visibleFlag"
-    :width="1000"
+    :width="1500"
     :footerStyle="{ textAlign: 'right' }"
     @close="onClose"
     :maskClosable="false"
@@ -175,7 +175,7 @@
       let insertAndUpdateValidated = await insertAndUpdateRef.value.validateForm();
       let deleteValidated = await deleteRef.value.validateForm();
 
-      if (!basicValidated || !insertAndUpdateValidated || !deleteValidated ) {
+      if (!basicValidated || !insertAndUpdateValidated || !deleteValidated) {
         return;
       }
 
@@ -201,7 +201,7 @@
       onClose();
     } catch (e) {
       smartSentry.captureError(e);
-    }finally{
+    } finally {
       SmartLoading.hide();
     }
   }
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
index e9290202..99b9ed3f 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
@@ -11,7 +11,7 @@
   <a-drawer
     title="代码预览"
     :open="visibleFlag"
-    :width="1200"
+    :width="1500"
     :footerStyle="{ textAlign: 'right' }"
     :bodyStyle="{ padding: '8px 24px' }"
     @close="onClose"
@@ -39,7 +39,7 @@
 <script setup>
   import { computed, nextTick, ref, watch } from 'vue';
   import { codeGeneratorApi } from '/@/api/support/code-generator-api';
-  import { JAVA_FILE_LIST, LANGUAGE_LIST, JS_FILE_LIST,TS_FILE_LIST, JAVA_DOMAIN_FILE_LIST } from '../../code-generator-util';
+  import { JAVA_FILE_LIST, LANGUAGE_LIST, JS_FILE_LIST, TS_FILE_LIST, JAVA_DOMAIN_FILE_LIST } from '../../code-generator-util';
   import { smartSentry } from '/@/lib/smart-sentry';
   import { lineNumbersBlock } from '/@/lib/highlight-line-number';
   import hljs from 'highlight.js';
@@ -74,11 +74,11 @@
   // ------------------ 标签页 ------------------
   const languageType = ref(LANGUAGE_LIST[0]);
   const tabList = computed(() => {
-    if(languageType.value === LANGUAGE_LIST[0]){
+    if (languageType.value === LANGUAGE_LIST[0]) {
       return JS_FILE_LIST;
-    }else if(languageType.value === LANGUAGE_LIST[1]){
+    } else if (languageType.value === LANGUAGE_LIST[1]) {
       return TS_FILE_LIST;
-    }else{
+    } else {
       return JAVA_FILE_LIST;
     }
   });
@@ -86,21 +86,21 @@
   const fileKey = ref(tabList.value[0]);
 
   function getLanguage() {
-    if(languageType.value === LANGUAGE_LIST[0]){
+    if (languageType.value === LANGUAGE_LIST[0]) {
       return 'javascript';
-    }else if(languageType.value === LANGUAGE_LIST[1]){
+    } else if (languageType.value === LANGUAGE_LIST[1]) {
       return 'typescript';
-    }else{
+    } else {
       return 'java';
     }
   }
 
-  function onChangeLanguageType(e){
-    if(e.target.value === LANGUAGE_LIST[0]){
+  function onChangeLanguageType(e) {
+    if (e.target.value === LANGUAGE_LIST[0]) {
       fileKey.value = JS_FILE_LIST[0];
-    }else if(e.target.value === LANGUAGE_LIST[1]){
+    } else if (e.target.value === LANGUAGE_LIST[1]) {
       fileKey.value = TS_FILE_LIST[0];
-    }else{
+    } else {
       fileKey.value = JAVA_FILE_LIST[0];
     }
     onChangeTab(fileKey.value);

From 594c84752324c258bcbebbd3c9f77724b702f276 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sun, 4 Aug 2024 21:58:39 +0800
Subject: [PATCH 14/22] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=9A1=E3=80=81?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=E5=90=8E=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B2=E3=80=81=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E5=88=A0=E9=99=A4=E6=9D=A1=E4=BB=B6=E5=B9=B6=E5=86=8D?=
 =?UTF-8?q?=E6=AC=A1=E6=96=B0=E5=A2=9E=E6=9D=A1=E4=BB=B6=E5=90=8E=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E3=80=90=E4=BF=9D=E5=AD=98=E3=80=91=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=97=A0=E5=8F=8D=E5=BA=94=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...enerator-table-config-form-query-field.vue | 58 ++++++++-----------
 1 file changed, 23 insertions(+), 35 deletions(-)

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
index 52576bcc..ecbbf79a 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
@@ -75,11 +75,9 @@
 </template>
 
 <script setup>
-  import _ from 'lodash';
   import Sortable from 'sortablejs';
   import { inject, nextTick, ref } from 'vue';
   import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
-  import { SmartLoading } from '/@/components/framework/smart-loading';
   import { CODE_QUERY_FIELD_QUERY_TYPE_ENUM } from '/@/constants/support/code-generator-const';
   import { convertLowerCamel } from '/@/utils/str-util';
 
@@ -130,12 +128,13 @@
 
   const tableColumns = ref([]);
 
+  let rowKeyCounter = 1;
   //初始化设置数据
   function setData(tableColumnInfos, config) {
     rowKeyCounter = 1;
     let data = config && config.queryFields ? config.queryFields : [];
     for (let index = 0; index < data.length; index++) {
-      data[index].rowKey = 'rowKey' + (index + 1);
+      data[index].rowKey = 'rowKey' + rowKeyCounter;
       rowKeyCounter++;
     }
     tableData.value = data;
@@ -147,7 +146,6 @@
   }
 
   // -------------------  增加、删除 -------------------
-  let rowKeyCounter = 1;
   function addQuery() {
     tableData.value.push({
       rowKey: 'rowKey' + rowKeyCounter,
@@ -155,13 +153,19 @@
       fieldName: '',
       queryTypeEnum: '',
       columnNameList: null,
-      width: '',
+      width: '200px',
     });
     rowKeyCounter++;
   }
 
   function onDelete(index) {
-    _.pullAt(tableData.value, index);
+    // 以这种方式删除 列表才会重新渲染
+    const tempList = [...tableData.value];
+    tempList.splice(index, 1);
+    tableData.value = [];
+    nextTick(() => {
+      tableData.value = tempList;
+    });
   }
 
   //初始化拖拽
@@ -173,6 +177,10 @@
       ghostClass: 'smart-ghost-class', //设置拖拽停靠样式类名
       chosenClass: 'smart-ghost-class', //设置选中样式类名
       handle: '.handle',
+      onEnd: ({ oldIndex, newIndex }) => {
+        const oldRow = tableData.value.splice(oldIndex, 1)[0];
+        tableData.value.splice(newIndex, 0, oldRow);
+      },
     });
   }
 
@@ -211,36 +219,16 @@
 
   // 获取表单数据
   function getFieldsForm() {
-    let result = [];
-    let trList = document.querySelectorAll('#smartCodeQueryFieldsTable tbody .column-row');
-    if (trList && trList.length === 0) {
-      return result;
-    }
-
-    for (let tr of trList) {
-      let rowKey = tr.getAttribute('data-row-key');
-      if (!rowKey) {
-        continue;
-      }
-      if (rowKey && rowKey.indexOf('rowKey') === -1) {
-        continue;
-      }
-
-      let index = parseInt(rowKey.substring(6));
-      let tableItem = tableData.value[index - 1];
-      let obj = {
-        queryTypeEnum: tableItem.queryTypeEnum,
-        label: tableItem.label,
-        fieldName: tableItem.fieldName,
-        columnNameList: tableItem.columnNameList,
-        width: tableItem.width,
+    let result = tableData.value.map((item) => {
+      return {
+        label: item.label,
+        width: item.width,
+        fieldName: item.fieldName,
+        queryTypeEnum: item.queryTypeEnum,
+        // 字符串转为数组
+        columnNameList: item.columnNameList && typeof item.columnNameList === 'string' ? [item.columnNameList] : item.columnNameList,
       };
-      // 字符串转为数组
-      if (obj.columnNameList && typeof obj.columnNameList === 'string') {
-        obj.columnNameList = [obj.columnNameList];
-      }
-      result.push(obj);
-    }
+    });
     return result;
   }
 

From dc9f4b7953d6090cccef9eec42633dbaa55af3dd Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sun, 4 Aug 2024 21:51:40 +0800
Subject: [PATCH 15/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E5=9D=97=EF=BC=9A1=E3=80=81?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E4=B8=8E=E6=96=87=E4=BB=B6=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=8F=E5=88=97=E5=8C=96=E6=B3=A8=E8=A7=A3?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81=E6=96=B0=E5=A2=9E=20bit-Boolean=20=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=E6=98=A0=E5=B0=84=EF=BC=9B=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=9C=A8create=5Ftime=E4=B8=8Eupdate=5Ftime=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=B8=8A=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sa/base/config/DataSourceConfig.java      |   4 +
 .../lab1024/sa/base/config/RedisConfig.java   |   4 +-
 .../base/handler/MybatisPlusFillHandler.java  |  40 ++++++
 .../constant/CodeFrontComponentEnum.java      |   2 +-
 .../domain/form/CodeGeneratorConfigForm.java  |   1 -
 .../model/CodeInsertAndUpdateField.java       |   4 +-
 .../service/CodeGeneratorTemplateService.java |   1 +
 .../CodeGenerateBaseVariableService.java      |  45 +++----
 .../domain/AddFormVariableService.java        |   4 +-
 .../backend/domain/EntityVariableService.java |  13 +-
 .../backend/domain/MapperVariableService.java |  57 +++------
 .../domain/QueryFormVariableService.java      |   6 +-
 .../domain/UpdateFormVariableService.java     |   7 +-
 .../backend/domain/VOVariableService.java     |  14 +-
 .../java/constant/enum.java.vm                |   1 +
 .../java/dao/Dao.java.vm                      |   7 +-
 .../java/domain/entity/Entity.java.vm         |  16 ++-
 .../java/domain/form/QueryForm.java.vm        |   5 +-
 .../java/domain/vo/VO.java.vm                 |  10 +-
 .../java/mapper/Mapper.xml.vm                 |  29 ++---
 .../java/service/Service.java.vm              |   4 +-
 .../code-generator-template/js/form.vue.vm    | 121 +++++++++---------
 .../code-generator-template/js/list.vue.vm    |  41 +++---
 .../code-generator/code-generator-util.js     |   8 +-
 ...ode-generator-table-config-form-delete.vue |   5 +-
 .../form/code-generator-table-config-form.vue |   6 +-
 .../preview/code-generator-preview-modal.vue  |  24 ++--
 27 files changed, 255 insertions(+), 224 deletions(-)
 create mode 100644 smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/handler/MybatisPlusFillHandler.java

diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java
index 4fb6945e..f1eea694 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java
@@ -7,10 +7,12 @@ import com.alibaba.druid.support.http.StatViewServlet;
 import com.alibaba.druid.support.http.WebStatFilter;
 import com.alibaba.druid.support.spring.stat.DruidStatInterceptor;
 import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.base.common.domain.DataScopePlugin;
+import net.lab1024.sa.base.handler.MybatisPlusFillHandler;
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
@@ -144,6 +146,8 @@ public class DataSourceConfig {
             pluginsList.add(dataScopePlugin);
         }
         factoryBean.setPlugins(pluginsList.toArray(new Interceptor[pluginsList.size()]));
+        // 添加字段自动填充处理
+        factoryBean.setGlobalConfig(new GlobalConfig().setBanner(false).setMetaObjectHandler(new MybatisPlusFillHandler()));
 
         return factoryBean.getObject();
     }
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java
index f6616e46..24a14773 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -43,7 +44,8 @@ public class RedisConfig {
                 .setSerializationInclusion(JsonInclude.Include.NON_NULL);
 
         om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        // enableDefaultTyping 官方已弃用 所以改为 activateDefaultTyping
+        om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
         jackson2JsonRedisSerializer.setObjectMapper(om);
         RedisTemplate<String, Object> template = new RedisTemplate<>();
         template.setConnectionFactory(factory);
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/handler/MybatisPlusFillHandler.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/handler/MybatisPlusFillHandler.java
new file mode 100644
index 00000000..372ff757
--- /dev/null
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/handler/MybatisPlusFillHandler.java
@@ -0,0 +1,40 @@
+package net.lab1024.sa.base.handler;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * Mybatis Plus 插入或者更新时指定字段设置值
+ *
+ * @author zhoumingfa
+ */
+@Component
+@Slf4j
+public class MybatisPlusFillHandler implements MetaObjectHandler {
+
+    public static final String CREATE_TIME = "createTime";
+
+    public static final String UPDATE_TIME = "updateTime";
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        if (metaObject.hasSetter(CREATE_TIME)) {
+            this.fillStrategy(metaObject, CREATE_TIME, LocalDateTime.now());
+        }
+        if (metaObject.hasSetter(UPDATE_TIME)) {
+            this.fillStrategy(metaObject, UPDATE_TIME, LocalDateTime.now());
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        if (metaObject.hasSetter(UPDATE_TIME)) {
+            this.fillStrategy(metaObject, UPDATE_TIME, LocalDateTime.now());
+        }
+    }
+
+}
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeFrontComponentEnum.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeFrontComponentEnum.java
index 5358806c..10c8779e 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeFrontComponentEnum.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeFrontComponentEnum.java
@@ -41,7 +41,7 @@ public enum CodeFrontComponentEnum implements BaseEnum {
     }
 
     @Override
-    public Object getValue() {
+    public String getValue() {
         return value;
     }
 
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java
index 10170b00..4e3c0398 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java
@@ -32,7 +32,6 @@ public class CodeGeneratorConfigForm {
     @Schema(description = "表名")
     private String tableName;
 
-
     @Valid
     @NotNull(message = "基础信息不能为空")
     @Schema(description = "基础信息")
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java
index db623864..5e83fd5d 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java
@@ -39,8 +39,8 @@ public class CodeInsertAndUpdateField {
     @Schema(description = "更新标识")
     private Boolean updateFlag;
 
-    @SchemaEnum(value = CodeGeneratorPageTypeEnum.class)
-    @CheckEnum(value = CodeFrontComponentEnum.class, message = "3.增加、修改  增加、修改 组件类型 枚举值错误", required = true)
+    @SchemaEnum(value = CodeFrontComponentEnum.class)
+    @CheckEnum(value = CodeFrontComponentEnum.class, message = "3.增加、修改 组件类型 枚举值错误", required = true)
     private String frontComponent;
 
 }
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
index 5161f0bb..ecad0c44 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
@@ -94,6 +94,7 @@ public class CodeGeneratorTemplateService {
                 String fileName = templateFile.startsWith("java") ? upperCamel + templateSplit[templateSplit.length - 1] : lowerHyphen + "-" + templateSplit[templateSplit.length - 1];
                 String fullPathFileName = templateFile.replaceAll(templateSplit[templateSplit.length - 1], fileName);
                 fullPathFileName = fullPathFileName.replaceAll("java/", "java/" + basic.getModuleName().toLowerCase() + "/");
+                fullPathFileName = fullPathFileName.replaceAll("js/", "js/" + basic.getModuleName().toLowerCase() + "/");
 
                 String fileContent = generate(tableName, templateFile, codeGeneratorConfigEntity);
                 File file = new File(uuid + "/" + fullPathFileName);
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
index 9602aeae..d39bf6bf 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
@@ -2,6 +2,7 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable;
 
 import com.google.common.base.CaseFormat;
 import net.lab1024.sa.base.common.util.SmartStringUtil;
+import net.lab1024.sa.base.module.support.codegenerator.constant.CodeFrontComponentEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdate;
@@ -17,7 +18,7 @@ import java.util.stream.Collectors;
  * @Date 2022/9/29 17:20:41
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 public abstract class CodeGenerateBaseVariableService {
 
@@ -43,13 +44,13 @@ public abstract class CodeGenerateBaseVariableService {
         String upperCamelName = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_CAMEL, form.getBasic().getModuleName());
         ArrayList<String> list = new ArrayList<>();
 
-        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.entity." + upperCamelName + "Entity;" );
+        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.entity." + upperCamelName + "Entity;");
 
-        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.form." + upperCamelName + "AddForm;" );
-        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.form." + upperCamelName + "UpdateForm;" );
-        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.form." + upperCamelName + "QueryForm;" );
+        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.form." + upperCamelName + "AddForm;");
+        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.form." + upperCamelName + "UpdateForm;");
+        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.form." + upperCamelName + "QueryForm;");
 
-        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.vo." + upperCamelName + "VO;" );
+        list.add("import " + form.getBasic().getJavaPackageName() + ".domain.vo." + upperCamelName + "VO;");
         return list;
     }
 
@@ -88,43 +89,33 @@ public abstract class CodeGenerateBaseVariableService {
         }
 
         CodeInsertAndUpdateField field = first.get();
-        return SmartStringUtil.contains(field.getFrontComponent(), "Upload" );
+        return SmartStringUtil.equals(field.getFrontComponent(), CodeFrontComponentEnum.FILE_UPLOAD.getValue());
     }
 
     /**
-     * 是否为 枚举
+     * 是否为 字典
      */
     protected boolean isDict(String columnName, CodeGeneratorConfigForm form) {
-        List<CodeField> fields = form.getFields();
-        if (CollectionUtils.isEmpty(fields)) {
-            return false;
-        }
-
-        Optional<CodeField> first = fields.stream().filter(e -> columnName.equals(e.getColumnName())).findFirst();
-        if (first.isPresent()) {
-            return false;
-        }
-
-        CodeField codeField = first.get();
-        return codeField.getDict() != null;
+        CodeField codeField = getCodeField(columnName, form);
+        return codeField != null && codeField.getDict() != null;
     }
 
     /**
      * 是否为 枚举
      */
     protected boolean isEnum(String columnName, CodeGeneratorConfigForm form) {
+        CodeField codeField = getCodeField(columnName, form);
+        return codeField != null && codeField.getEnumName() != null;
+    }
+
+    private CodeField getCodeField(String columnName, CodeGeneratorConfigForm form) {
         List<CodeField> fields = form.getFields();
         if (CollectionUtils.isEmpty(fields)) {
-            return false;
+            return null;
         }
 
         Optional<CodeField> first = fields.stream().filter(e -> columnName.equals(e.getColumnName())).findFirst();
-        if (first.isPresent()) {
-            return false;
-        }
-
-        CodeField codeField = first.get();
-        return codeField.getEnumName() != null;
+        return first.orElse(null);
     }
 
     /**
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java
index 0d2e13fc..1d29259a 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java
@@ -2,6 +2,7 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable.backen
 
 import cn.hutool.core.bean.BeanUtil;
 import net.lab1024.sa.base.common.util.SmartStringUtil;
+import net.lab1024.sa.base.module.support.codegenerator.constant.CodeFrontComponentEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdate;
@@ -100,7 +101,6 @@ public class AddFormVariableService extends CodeGenerateBaseVariableService {
                 }
             }
 
-
             //字典
             if (SmartStringUtil.isNotEmpty(codeField.getDict())) {
                 finalFieldMap.put("dict", "\n    @JsonDeserialize(using = DictValueVoDeserializer.class)");
@@ -109,7 +109,7 @@ public class AddFormVariableService extends CodeGenerateBaseVariableService {
             }
 
             //文件上传
-            if (SmartStringUtil.contains(field.getFrontComponent(), "Upload")) {
+            if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent())) {
                 finalFieldMap.put("file", "\n    @JsonDeserialize(using = FileKeyVoDeserializer.class)");
                 packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
                 packageList.add("import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;");
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/EntityVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/EntityVariableService.java
index 59a3fa86..391bffa4 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/EntityVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/EntityVariableService.java
@@ -14,7 +14,7 @@ import java.util.stream.Collectors;
  * @Date 2022/9/29 17:20:41
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 
 public class EntityVariableService extends CodeGenerateBaseVariableService {
@@ -54,14 +54,21 @@ public class EntityVariableService extends CodeGenerateBaseVariableService {
         // mybatis plus
         result.add("import com.baomidou.mybatisplus.annotation.TableName;");
 
+        // 自动填充注解
+        boolean existCreateAndUpdate = fields.stream().anyMatch(e -> "create_time".equals(e.getColumnName()) || "update_time".equals(e.getColumnName()));
+        if (existCreateAndUpdate) {
+            result.add("import com.baomidou.mybatisplus.annotation.FieldFill;");
+            result.add("import com.baomidou.mybatisplus.annotation.TableField;");
+        }
+
         //主键
-        boolean isExistPrimaryKey = fields.stream().filter(e -> e.getPrimaryKeyFlag() != null && e.getPrimaryKeyFlag()).findFirst().isPresent();
+        boolean isExistPrimaryKey = fields.stream().anyMatch(e -> e.getPrimaryKeyFlag() != null && e.getPrimaryKeyFlag());
         if (isExistPrimaryKey) {
             result.add("import com.baomidou.mybatisplus.annotation.TableId;");
         }
 
         //自增
-        boolean isExistAutoIncrease = fields.stream().filter(e -> e.getAutoIncreaseFlag() != null && e.getAutoIncreaseFlag()).findFirst().isPresent();
+        boolean isExistAutoIncrease = fields.stream().anyMatch(e -> e.getAutoIncreaseFlag() != null && e.getAutoIncreaseFlag());
         if (isExistAutoIncrease) {
             result.add("import com.baomidou.mybatisplus.annotation.IdType;");
         }
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java
index 1be48fc6..c6371d98 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java
@@ -3,19 +3,20 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable.backen
 import cn.hutool.core.bean.BeanUtil;
 import net.lab1024.sa.base.module.support.codegenerator.constant.CodeQueryFieldQueryTypeEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
-import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdateField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeQueryField;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
-import org.apache.commons.collections4.CollectionUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Author 1024创新实验室-主任:卓大
  * @Date 2022/9/29 17:20:41
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 
 public class MapperVariableService extends CodeGenerateBaseVariableService {
@@ -39,55 +40,39 @@ public class MapperVariableService extends CodeGenerateBaseVariableService {
                 List<String> columnNameList = queryField.getColumnNameList();
                 if (columnNameList.size() == 1) {
                     // AND INSTR(t_notice.title,#{query.keywords})
-                    stringBuilder.append("        AND INSTR(" )
-                            .append(form.getTableName()).append("." ).append(queryField.getColumnNameList().get(0))
-                            .append(",#{queryForm." )
+                    stringBuilder.append("        AND INSTR(")
+                            .append(form.getTableName()).append(".").append(queryField.getColumnNameList().get(0))
+                            .append(",#{queryForm.")
                             .append(queryField.getFieldName())
-                            .append("})" );
+                            .append("})");
                 } else {
                     for (int i = 0; i < columnNameList.size(); i++) {
                         if (i == 0) {
-                            stringBuilder.append("AND ( INSTR(" )
-                                    .append(form.getTableName()).append("." ).append(queryField.getColumnNameList().get(i))
-                                    .append(",#{queryForm." )
+                            stringBuilder.append("AND ( INSTR(")
+                                    .append(form.getTableName()).append(".").append(queryField.getColumnNameList().get(i))
+                                    .append(",#{queryForm.")
                                     .append(queryField.getFieldName())
-                                    .append("})" );
+                                    .append("})");
                         } else {
                             // OR INSTR(t_notice.author,#{query.keywords})
-                            stringBuilder.append("\n                OR INSTR(" )
-                                    .append(form.getTableName()).append("." ).append(queryField.getColumnNameList().get(i))
-                                    .append(",#{queryForm." )
+                            stringBuilder.append("\n                OR INSTR(")
+                                    .append(form.getTableName()).append(".").append(queryField.getColumnNameList().get(i))
+                                    .append(",#{queryForm.")
                                     .append(queryField.getFieldName())
-                                    .append("})" );
+                                    .append("})");
                         }
                     }
-                    stringBuilder.append("\n            )" );
+                    stringBuilder.append("\n            )");
                 }
                 fieldMap.put("likeStr", stringBuilder.toString());
-            }else{
-                fieldMap.put("columnName",queryField.getColumnNameList().get(0));
+            } else {
+                fieldMap.put("columnName", queryField.getColumnNameList().get(0));
             }
         }
 
         variablesMap.put("queryFields", finalQueryFiledList);
-        variablesMap.put("daoClassName", form.getBasic().getJavaPackageName() + ".dao." + form.getBasic().getModuleName() + "Dao" );
+        variablesMap.put("daoClassName", form.getBasic().getJavaPackageName() + ".dao." + form.getBasic().getModuleName() + "Dao");
         return variablesMap;
     }
 
-
-    public List<String> getPackageList(List<CodeInsertAndUpdateField> fields, CodeGeneratorConfigForm form) {
-        if (CollectionUtils.isEmpty(fields)) {
-            return new ArrayList<>();
-        }
-
-        HashSet<String> packageList = new HashSet<>();
-
-        //1、javabean相关的包
-        packageList.addAll(getJavaBeanImportClass(form));
-
-        //2、dao
-        packageList.add("import " + form.getBasic().getJavaPackageName() + ".dao." + form.getBasic().getModuleName() + "Dao;" );
-        return new ArrayList<>(packageList);
-    }
-
 }
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java
index 2c513790..24d74e5d 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java
@@ -18,7 +18,7 @@ import java.util.stream.Collectors;
  * @Date 2022/9/29 17:20:41
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 
 public class QueryFormVariableService extends CodeGenerateBaseVariableService {
@@ -75,9 +75,6 @@ public class QueryFormVariableService extends CodeGenerateBaseVariableService {
             CodeField codeField = null;
 
             switch (queryTypeEnum) {
-                case LIKE:
-                    finalFieldMap.put("javaType", "String");
-                    break;
                 case EQUAL:
                     codeField = getCodeFieldByColumnName(field.getColumnNameList().get(0), form);
                     if (codeField == null) {
@@ -119,6 +116,7 @@ public class QueryFormVariableService extends CodeGenerateBaseVariableService {
 
         // lombok
         packageList.add("import lombok.Data;");
+        packageList.add("import lombok.EqualsAndHashCode;");
 
         List<String> packageNameList = packageList.stream().filter(Objects::nonNull).collect(Collectors.toList());
         Collections.sort(packageNameList);
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java
index 89bb5a18..004e7670 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java
@@ -2,6 +2,7 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable.backen
 
 import cn.hutool.core.bean.BeanUtil;
 import net.lab1024.sa.base.common.util.SmartStringUtil;
+import net.lab1024.sa.base.module.support.codegenerator.constant.CodeFrontComponentEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdate;
@@ -18,7 +19,7 @@ import java.util.stream.Collectors;
  * @Date 2022/9/29 17:20:41
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 
 public class UpdateFormVariableService extends CodeGenerateBaseVariableService {
@@ -42,7 +43,7 @@ public class UpdateFormVariableService extends CodeGenerateBaseVariableService {
                         return false;
                     }
 
-                    if(Boolean.TRUE.equals(codeField.getPrimaryKeyFlag())){
+                    if (Boolean.TRUE.equals(codeField.getPrimaryKeyFlag())) {
                         e.setRequiredFlag(true);
                     }
 
@@ -123,7 +124,7 @@ public class UpdateFormVariableService extends CodeGenerateBaseVariableService {
             }
 
             //文件上传
-            if (SmartStringUtil.contains(field.getFrontComponent(), "Upload")) {
+            if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent())) {
                 finalFieldMap.put("file", "\n    @JsonDeserialize(using = FileKeyVoDeserializer.class)");
                 packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
                 packageList.add("import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;");
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
index fceef52a..cde09227 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
@@ -17,7 +17,7 @@ import java.util.stream.Collectors;
  * @Date 2022/9/29 17:20:41
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 
 public class VOVariableService extends CodeGenerateBaseVariableService {
@@ -87,16 +87,16 @@ public class VOVariableService extends CodeGenerateBaseVariableService {
 
             //字典
             if (isDict(field.getColumnName(), form)) {
-                finalFieldMap.put("dict", "\n    @JsonDeserialize(using = DictValueVoDeserializer.class)");
-                packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
-                packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;");
+                finalFieldMap.put("dict", "\n    @JsonSerialize(using = DictValueVoSerializer.class)");
+                packageList.add("import com.fasterxml.jackson.databind.annotation.JsonSerialize;");
+                packageList.add("import net.lab1024.sa.base.common.json.serializer.DictValueVoSerializer;");
             }
 
             //文件上传
             if (isFile(field.getColumnName(), form)) {
-                finalFieldMap.put("file", "\n    @JsonDeserialize(using = FileKeyVoDeserializer.class)");
-                packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
-                packageList.add("import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;");
+                finalFieldMap.put("file", "\n    @JsonSerialize(using = FileKeyVoSerializer.class)");
+                packageList.add("import com.fasterxml.jackson.databind.annotation.JsonSerialize;");
+                packageList.add("import net.lab1024.sa.base.common.json.serializer.FileKeyVoSerializer;");
             }
 
             packageList.add(getJavaPackageName(codeField.getJavaType()));
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/constant/enum.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/constant/enum.java.vm
index e67215ae..87c2c644 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/constant/enum.java.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/constant/enum.java.vm
@@ -2,6 +2,7 @@ package ${packageName};
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import net.lab1024.sa.base.common.enumeration.BaseEnum;
 
 /**
  * ${enumDesc}
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm
index b14411a9..938b758e 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm
@@ -38,14 +38,15 @@ public interface ${name.upperCamel}Dao extends BaseMapper<${name.upperCamel}Enti
      * 更新删除状态
      */
     long updateDeleted(@Param("${primaryKeyFieldName}")${primaryKeyJavaType} ${primaryKeyFieldName},@Param("${deletedFlag}")boolean deletedFlag);
+
 #end
 #if($deleteInfo.deleteEnum == "Batch" || $deleteInfo.deleteEnum == "SingleAndBatch")
     /**
      * 批量更新删除状态
      */
     void batchUpdateDeleted(@Param("idList")List<${primaryKeyJavaType}> idList,@Param("${deletedFlag}")boolean deletedFlag);
-#end
-#end
-#end
 
+#end
+#end
+#end
 }
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
index dd1fe0bb..04230b36 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
@@ -20,13 +20,19 @@ public class ${name.upperCamel}Entity {
     /**
      * $field.label
      */
-#if($field.primaryKeyFlag && $field.autoIncreaseFlag)
+    #if($field.primaryKeyFlag && $field.autoIncreaseFlag)
     @TableId(type = IdType.AUTO)
-#end
-#if($field.primaryKeyFlag && !$field.autoIncreaseFlag)
+    #end
+    #if($field.primaryKeyFlag && !$field.autoIncreaseFlag)
     @TableId
-#end
+    #end
+    #if($field.columnName == "create_time")
+    @TableField(fill = FieldFill.INSERT)
+    #end
+    #if($field.columnName == "update_time")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    #end
     private $field.javaType $field.fieldName;
 #end
 
-}
\ No newline at end of file
+}
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/form/QueryForm.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/form/QueryForm.java.vm
index ba764981..69a247e2 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/form/QueryForm.java.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/form/QueryForm.java.vm
@@ -14,7 +14,8 @@ $importClass
  */
 
 @Data
-public class ${name.upperCamel}QueryForm extends PageParam{
+@EqualsAndHashCode(callSuper = false)
+public class ${name.upperCamel}QueryForm extends PageParam {
 #foreach ($field in $fields)
 
 #if($field.isEnum)
@@ -35,4 +36,4 @@ public class ${name.upperCamel}QueryForm extends PageParam{
 #end
 #end
 
-}
\ No newline at end of file
+}
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
index 88aed8b3..4a84efd0 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
@@ -17,14 +17,8 @@ public class ${name.upperCamel}VO {
 
 #foreach ($field in $fields)
 
-#if($field.isEnum)
-    ${field.apiModelProperty}
+    ${field.apiModelProperty}$!{field.notEmpty}$!{field.dict}$!{field.file}
     private $field.javaType $field.fieldName;
 #end
-#if(!$field.isEnum)
-    ${field.apiModelProperty}$!{field.dict}$!{field.file}
-    private $field.javaType $field.fieldName;
-#end
-#end
 
-}
\ No newline at end of file
+}
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm
index d6809423..0a205951 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm
@@ -2,10 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="${daoClassName}">
 
+    <!-- 查询结果列 -->
+    <sql id="base_columns">
+        #foreach ($field in $fields)
+        ${tableName}.${field.columnName}#if($foreach.hasNext),#end
+        #end
+    </sql>
+
     <!-- 分页查询 -->
     <select id="queryPage" resultType="${basic.javaPackageName}.domain.vo.${name.upperCamel}VO">
         SELECT
-        *
+        <include refid="base_columns"/>
         FROM ${tableName}
 #if($queryFields.size() > 0)
         <where>
@@ -23,15 +30,15 @@
 #end
 #if(${queryField.queryTypeEnum} == "Date")
             <if test="queryForm.${queryField.fieldName} != null">
-                AND DATE_FORMAT(${tableName}.${queryField.columnName}, '%Y-%m-%d') = #{queryForm.${queryField.fieldName}}
+                AND ${tableName}.${queryField.columnName} = #{queryForm.${queryField.fieldName}}
             </if>
 #end
 #if(${queryField.queryTypeEnum} == "DateRange")
             <if test="queryForm.${queryField.fieldName}Begin != null">
-                AND DATE_FORMAT(${tableName}.${queryField.columnName}, '%Y-%m-%d') &gt;= #{queryForm.${queryField.fieldName}Begin}
+                AND ${tableName}.${queryField.columnName} &gt;= #{queryForm.${queryField.fieldName}Begin}
             </if>
             <if test="queryForm.${queryField.fieldName}End != null">
-                AND DATE_FORMAT(${tableName}.${queryField.columnName}, '%Y-%m-%d') &lt;= #{queryForm.${queryField.fieldName}End}
+                AND ${tableName}.${queryField.columnName} &lt;= #{queryForm.${queryField.fieldName}End}
             </if>
 #end
 #end
@@ -39,21 +46,10 @@
 #end
     </select>
 
-#if($dao.deletedFieldUpperName != $null)
-    <update id="batchUpdate${dao.deletedFieldUpperName}">
-        update ${mapper.tableName} set ${mapper.deletedColumnName} = #{deletedFlag}
-        where ${mapper.mainKeyColumnName} in
-        <foreach collection="idList" open="(" close=")" separator="," item="item">
-            #{item}
-        </foreach>
-    </update>
-#end
-
 #if($deleteInfo.isSupportDelete)
 ### 假删除
 #if(!${deleteInfo.isPhysicallyDeleted})
 #if($deleteInfo.deleteEnum == "Batch" || $deleteInfo.deleteEnum == "SingleAndBatch")
-
     <update id="batchUpdateDeleted">
         update ${tableName} set deleted_flag = #{deletedFlag}
         where ${primaryKeyColumnName} in
@@ -71,4 +67,5 @@
 #end
 #end
 #end
-</mapper>
\ No newline at end of file
+
+</mapper>
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm
index 923e6e06..3be777d5 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm
@@ -64,7 +64,7 @@ public class ${name.upperCamel}Service {
 #end
 
 #if($deleteInfo.isSupportDelete)
-    #if($deleteInfo.deleteEnum == "BATCH" || $deleteInfo.deleteEnum == "SingleAndBatch")
+    #if($deleteInfo.deleteEnum == "Batch" || $deleteInfo.deleteEnum == "SingleAndBatch")
     /**
      * 批量删除
      *
@@ -97,7 +97,7 @@ public class ${name.upperCamel}Service {
 
 ### 真删除 or 假删除
 #if(!${deleteInfo.isPhysicallyDeleted})
-        ${name.lowerCamel}Dao.updateDeleted(${primaryKeyFieldName},true);
+        ${name.lowerCamel}Dao.updateDeleted(${primaryKeyFieldName}, true);
 #end
 #if(${deleteInfo.isPhysicallyDeleted})
         ${name.lowerCamel}Dao.deleteById(${primaryKeyFieldName});
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
index 1de462cd..ea0b2d1d 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
@@ -21,59 +21,59 @@
     <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" >
         #if($insertAndUpdate.countPerLine == 1)
           <a-row>
-              #foreach ($field in $formFields)
-                  #if($field.frontComponent == "Input")
-                    <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                      <a-input style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "InputNumber")
-                    <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                      <a-input-number style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "Textarea")
-                    <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                      <a-textarea style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "BooleanSelect")
-                    <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                      <BooleanSelect v-model:value="form.${field.fieldName}" style="width: 100%" />
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "SmartEnumSelect")
-                    <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-                      <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "DictSelect")
-                    <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-                      <DictSelect width="100%" v-model:value="form.${field.fieldName}" keyCode="$!{field.dict}" placeholder="$!{field.label}"/>
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "Date")
-                    <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                      <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}"/>
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "DateTime")
-                    <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                      <a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
-                    </a-form-item>
-                  #end
-                  #if($field.frontComponent == "Upload")
-                    <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                      <FileUpload
-                          :defaultFileList="form.$!{field.fieldName}"
-                          :folder="FILE_FOLDER_TYPE_ENUM.COMMON.value"
-                          buttonText="上传 $!{field.label}"
-                          listType="text"
-                          @change="e => form.$!{field.fieldName} = e"
-                      />
-                    </a-form-item>
-                  #end
+          #foreach ($field in $formFields)
+              #if($field.frontComponent == "Input")
+                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+                  <a-input style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
+                </a-form-item>
               #end
+              #if($field.frontComponent == "InputNumber")
+                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+                  <a-input-number style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
+                </a-form-item>
+              #end
+              #if($field.frontComponent == "Textarea")
+                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+                  <a-textarea style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
+                </a-form-item>
+              #end
+              #if($field.frontComponent == "BooleanSelect")
+                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+                  <BooleanSelect v-model:value="form.${field.fieldName}" style="width: 100%" />
+                </a-form-item>
+              #end
+              #if($field.frontComponent == "SmartEnumSelect")
+                <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
+                  <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
+                </a-form-item>
+              #end
+              #if($field.frontComponent == "DictSelect")
+                <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
+                  <DictSelect width="100%" v-model:value="form.${field.fieldName}" keyCode="$!{field.dict}" placeholder="$!{field.label}"/>
+                </a-form-item>
+              #end
+              #if($field.frontComponent == "Date")
+                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+                  <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}"/>
+                </a-form-item>
+              #end
+              #if($field.frontComponent == "DateTime")
+                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+                  <a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
+                </a-form-item>
+              #end
+              #if($field.frontComponent == "FileUpload")
+                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+                  <FileUpload
+                      :defaultFileList="form.$!{field.fieldName}"
+                      :folder="FILE_FOLDER_TYPE_ENUM.COMMON.value"
+                      buttonText="上传 $!{field.label}"
+                      listType="text"
+                      @change="e => form.$!{field.fieldName} = e"
+                  />
+                </a-form-item>
+              #end
+          #end
           </a-row>
         #end
 
@@ -122,7 +122,7 @@
                         <a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
                       </a-form-item>
                     #end
-                    #if($field.frontComponent == "Upload")
+                    #if($field.frontComponent == "FileUpload")
                       <a-form-item label="$!{field.label}"  name="${field.fieldName}">
                         <FileUpload
                             :defaultFileList="form.$!{field.fieldName}"
@@ -154,9 +154,9 @@
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { $!{name.lowerCamel}Api } from '/@/api/business/$!{name.lowerHyphenCamel}/$!{name.lowerHyphenCamel}-api';
   import { smartSentry } from '/@/lib/smart-sentry';
-      #foreach ($import in $frontImportList)
-          $!{import}
-      #end
+  #foreach ($import in $frontImportList)
+  $!{import}
+  #end
 
   // ------------------------ 事件 ------------------------
 
@@ -188,9 +188,8 @@
   const formRef = ref();
 
   const formDefault = {
-          $!{primaryKeyFieldName}: undefined,
       #foreach ($field in $formFields)
-              $!{field.fieldName}: undefined, //$!{field.label}
+      $!{field.fieldName}: undefined, //$!{field.label}
       #end
   };
 
@@ -198,9 +197,9 @@
 
   const rules = {
       #foreach ($field in $formFields)
-          #if($field.requiredFlag)
-                  $!{field.fieldName}: [{ required: true, message: '$!{field.label} 必填' }],
-          #end
+      #if($field.requiredFlag)
+      $!{field.fieldName}: [{ required: true, message: '$!{field.label} 必填' }],
+      #end
       #end
   };
 
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
index a4ca4d4f..15367104 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
@@ -88,18 +88,18 @@
 
         <!---------- 表格 begin ----------->
         <a-table
-                size="small"
-                :dataSource="tableData"
-                :columns="columns"
-                rowKey="$!{primaryKeyFieldName}"
-                bordered
-                :loading="tableLoading"
-                :pagination="false"
+            size="small"
+            :dataSource="tableData"
+            :columns="columns"
+            rowKey="$!{primaryKeyFieldName}"
+            bordered
+            :loading="tableLoading"
+            :pagination="false"
 #if($deleteInfo.isSupportDelete && ($deleteInfo.deleteEnum == "Batch"||$deleteInfo.deleteEnum == "SingleAndBatch"))
-                :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
+            :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
 #end
         >
-            <template #bodyCell="{ text, record, column }">
+            <template #bodyCell="{ record, column }">
                 <template v-if="column.dataIndex === 'action'">
                     <div class="smart-table-operate">
 #if($insertAndUpdate.isSupportInsertAndUpdate)
@@ -116,17 +116,17 @@
 
         <div class="smart-query-table-page">
             <a-pagination
-                    showSizeChanger
-                    showQuickJumper
-                    show-less-items
-                    :pageSizeOptions="PAGE_SIZE_OPTIONS"
-                    :defaultPageSize="queryForm.pageSize"
-                    v-model:current="queryForm.pageNum"
-                    v-model:pageSize="queryForm.pageSize"
-                    :total="total"
-                    @change="queryData"
-                    @showSizeChange="queryData"
-                    :show-total="(total) => `共${total}条`"
+                showSizeChanger
+                showQuickJumper
+                show-less-items
+                :pageSizeOptions="PAGE_SIZE_OPTIONS"
+                :defaultPageSize="queryForm.pageSize"
+                v-model:current="queryForm.pageNum"
+                v-model:pageSize="queryForm.pageSize"
+                :total="total"
+                @change="queryData"
+                @showSizeChange="queryData"
+                :show-total="(total) => `共${total}条`"
             />
         </div>
 
@@ -145,6 +145,7 @@
 #foreach ($import in $frontImportList)
     $!{import}
 #end
+
     // ---------------------------- 表格列 ----------------------------
 
     const columns = ref([
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js
index 8c1385a7..555d4457 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js
@@ -2,6 +2,7 @@ import { convertUpperCamel } from '/@/utils/str-util';
 
 // -------------------------------- java 类型 --------------------------------
 export const JavaTypeMap = new Map();
+JavaTypeMap.set('bit', 'Boolean');
 JavaTypeMap.set('int', 'Integer');
 JavaTypeMap.set('tinyint', 'Integer');
 JavaTypeMap.set('smallint', 'Integer');
@@ -37,6 +38,7 @@ export function getJavaType(dataType) {
 
 // -------------------------------- js 类型 --------------------------------
 export const JsTypeMap = new Map();
+JsTypeMap.set('bit', 'Boolean');
 JsTypeMap.set('int', 'Number');
 JsTypeMap.set('tinyint', 'Number');
 JsTypeMap.set('smallint', 'Number');
@@ -56,11 +58,10 @@ JsTypeMap.set('date', 'Date');
 JsTypeMap.set('datetime', 'Date');
 
 export const JsTypeList = [
+  'Boolean', //
   'Number', //
   'String', //
   'Date', //
-  'Boolean', //
-  'String', //
 ];
 
 export function getJsType(dataType) {
@@ -70,8 +71,9 @@ export function getJsType(dataType) {
 // -------------------------------- 前端组件 --------------------------------
 
 export const FrontComponentMap = new Map();
+FrontComponentMap.set('bit', 'BooleanSelect');
 FrontComponentMap.set('int', 'InputNumber');
-FrontComponentMap.set('tinyint', 'BooleanSelect');
+FrontComponentMap.set('tinyint', 'InputNumber');
 FrontComponentMap.set('smallint', 'InputNumber');
 FrontComponentMap.set('integer', 'InputNumber');
 FrontComponentMap.set('year', 'Date');
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
index 6ce3c30d..b289780e 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
@@ -68,11 +68,12 @@
     if (deletedFlagColumn) {
       deleteFlagColumnName.value = deletedFlagColumn.columnName;
     }
+    console.log(deletedFlagColumn);
 
     //表单
-    let deleteInfo = config.delete;
+    let deleteInfo = config.deleteInfo;
 
-    formData.isSupportDelete = deleteInfo && deleteInfo.isSupportDelete ? deleteInfo.isSupportDelete : true;
+    formData.isSupportDelete = deleteInfo && deleteInfo.isSupportDelete;
     formData.isPhysicallyDeleted = deleteInfo && deleteInfo.isPhysicallyDeleted ? deleteInfo.isPhysicallyDeleted : !deletedFlagColumn;
     formData.deleteEnum = deleteInfo && deleteInfo.deleteEnum ? deleteInfo.deleteEnum : CODE_DELETE_ENUM.SINGLE_AND_BATCH.value;
   }
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
index cc9b767b..9a2e8ada 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
@@ -12,7 +12,7 @@
     title="代码配置"
     style=""
     :open="visibleFlag"
-    :width="1000"
+    :width="1500"
     :footerStyle="{ textAlign: 'right' }"
     @close="onClose"
     :maskClosable="false"
@@ -175,7 +175,7 @@
       let insertAndUpdateValidated = await insertAndUpdateRef.value.validateForm();
       let deleteValidated = await deleteRef.value.validateForm();
 
-      if (!basicValidated || !insertAndUpdateValidated || !deleteValidated ) {
+      if (!basicValidated || !insertAndUpdateValidated || !deleteValidated) {
         return;
       }
 
@@ -201,7 +201,7 @@
       onClose();
     } catch (e) {
       smartSentry.captureError(e);
-    }finally{
+    } finally {
       SmartLoading.hide();
     }
   }
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
index e9290202..99b9ed3f 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
@@ -11,7 +11,7 @@
   <a-drawer
     title="代码预览"
     :open="visibleFlag"
-    :width="1200"
+    :width="1500"
     :footerStyle="{ textAlign: 'right' }"
     :bodyStyle="{ padding: '8px 24px' }"
     @close="onClose"
@@ -39,7 +39,7 @@
 <script setup>
   import { computed, nextTick, ref, watch } from 'vue';
   import { codeGeneratorApi } from '/@/api/support/code-generator-api';
-  import { JAVA_FILE_LIST, LANGUAGE_LIST, JS_FILE_LIST,TS_FILE_LIST, JAVA_DOMAIN_FILE_LIST } from '../../code-generator-util';
+  import { JAVA_FILE_LIST, LANGUAGE_LIST, JS_FILE_LIST, TS_FILE_LIST, JAVA_DOMAIN_FILE_LIST } from '../../code-generator-util';
   import { smartSentry } from '/@/lib/smart-sentry';
   import { lineNumbersBlock } from '/@/lib/highlight-line-number';
   import hljs from 'highlight.js';
@@ -74,11 +74,11 @@
   // ------------------ 标签页 ------------------
   const languageType = ref(LANGUAGE_LIST[0]);
   const tabList = computed(() => {
-    if(languageType.value === LANGUAGE_LIST[0]){
+    if (languageType.value === LANGUAGE_LIST[0]) {
       return JS_FILE_LIST;
-    }else if(languageType.value === LANGUAGE_LIST[1]){
+    } else if (languageType.value === LANGUAGE_LIST[1]) {
       return TS_FILE_LIST;
-    }else{
+    } else {
       return JAVA_FILE_LIST;
     }
   });
@@ -86,21 +86,21 @@
   const fileKey = ref(tabList.value[0]);
 
   function getLanguage() {
-    if(languageType.value === LANGUAGE_LIST[0]){
+    if (languageType.value === LANGUAGE_LIST[0]) {
       return 'javascript';
-    }else if(languageType.value === LANGUAGE_LIST[1]){
+    } else if (languageType.value === LANGUAGE_LIST[1]) {
       return 'typescript';
-    }else{
+    } else {
       return 'java';
     }
   }
 
-  function onChangeLanguageType(e){
-    if(e.target.value === LANGUAGE_LIST[0]){
+  function onChangeLanguageType(e) {
+    if (e.target.value === LANGUAGE_LIST[0]) {
       fileKey.value = JS_FILE_LIST[0];
-    }else if(e.target.value === LANGUAGE_LIST[1]){
+    } else if (e.target.value === LANGUAGE_LIST[1]) {
       fileKey.value = TS_FILE_LIST[0];
-    }else{
+    } else {
       fileKey.value = JAVA_FILE_LIST[0];
     }
     onChangeTab(fileKey.value);

From 6c28721b384ce2d498594bc13fb5addaafcf69ac Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Sun, 4 Aug 2024 21:58:39 +0800
Subject: [PATCH 16/22] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=9A1=E3=80=81?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=E5=90=8E=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B2=E3=80=81=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E5=88=A0=E9=99=A4=E6=9D=A1=E4=BB=B6=E5=B9=B6=E5=86=8D?=
 =?UTF-8?q?=E6=AC=A1=E6=96=B0=E5=A2=9E=E6=9D=A1=E4=BB=B6=E5=90=8E=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E3=80=90=E4=BF=9D=E5=AD=98=E3=80=91=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=97=A0=E5=8F=8D=E5=BA=94=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...enerator-table-config-form-query-field.vue | 58 ++++++++-----------
 1 file changed, 23 insertions(+), 35 deletions(-)

diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
index 52576bcc..ecbbf79a 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
@@ -75,11 +75,9 @@
 </template>
 
 <script setup>
-  import _ from 'lodash';
   import Sortable from 'sortablejs';
   import { inject, nextTick, ref } from 'vue';
   import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
-  import { SmartLoading } from '/@/components/framework/smart-loading';
   import { CODE_QUERY_FIELD_QUERY_TYPE_ENUM } from '/@/constants/support/code-generator-const';
   import { convertLowerCamel } from '/@/utils/str-util';
 
@@ -130,12 +128,13 @@
 
   const tableColumns = ref([]);
 
+  let rowKeyCounter = 1;
   //初始化设置数据
   function setData(tableColumnInfos, config) {
     rowKeyCounter = 1;
     let data = config && config.queryFields ? config.queryFields : [];
     for (let index = 0; index < data.length; index++) {
-      data[index].rowKey = 'rowKey' + (index + 1);
+      data[index].rowKey = 'rowKey' + rowKeyCounter;
       rowKeyCounter++;
     }
     tableData.value = data;
@@ -147,7 +146,6 @@
   }
 
   // -------------------  增加、删除 -------------------
-  let rowKeyCounter = 1;
   function addQuery() {
     tableData.value.push({
       rowKey: 'rowKey' + rowKeyCounter,
@@ -155,13 +153,19 @@
       fieldName: '',
       queryTypeEnum: '',
       columnNameList: null,
-      width: '',
+      width: '200px',
     });
     rowKeyCounter++;
   }
 
   function onDelete(index) {
-    _.pullAt(tableData.value, index);
+    // 以这种方式删除 列表才会重新渲染
+    const tempList = [...tableData.value];
+    tempList.splice(index, 1);
+    tableData.value = [];
+    nextTick(() => {
+      tableData.value = tempList;
+    });
   }
 
   //初始化拖拽
@@ -173,6 +177,10 @@
       ghostClass: 'smart-ghost-class', //设置拖拽停靠样式类名
       chosenClass: 'smart-ghost-class', //设置选中样式类名
       handle: '.handle',
+      onEnd: ({ oldIndex, newIndex }) => {
+        const oldRow = tableData.value.splice(oldIndex, 1)[0];
+        tableData.value.splice(newIndex, 0, oldRow);
+      },
     });
   }
 
@@ -211,36 +219,16 @@
 
   // 获取表单数据
   function getFieldsForm() {
-    let result = [];
-    let trList = document.querySelectorAll('#smartCodeQueryFieldsTable tbody .column-row');
-    if (trList && trList.length === 0) {
-      return result;
-    }
-
-    for (let tr of trList) {
-      let rowKey = tr.getAttribute('data-row-key');
-      if (!rowKey) {
-        continue;
-      }
-      if (rowKey && rowKey.indexOf('rowKey') === -1) {
-        continue;
-      }
-
-      let index = parseInt(rowKey.substring(6));
-      let tableItem = tableData.value[index - 1];
-      let obj = {
-        queryTypeEnum: tableItem.queryTypeEnum,
-        label: tableItem.label,
-        fieldName: tableItem.fieldName,
-        columnNameList: tableItem.columnNameList,
-        width: tableItem.width,
+    let result = tableData.value.map((item) => {
+      return {
+        label: item.label,
+        width: item.width,
+        fieldName: item.fieldName,
+        queryTypeEnum: item.queryTypeEnum,
+        // 字符串转为数组
+        columnNameList: item.columnNameList && typeof item.columnNameList === 'string' ? [item.columnNameList] : item.columnNameList,
       };
-      // 字符串转为数组
-      if (obj.columnNameList && typeof obj.columnNameList === 'string') {
-        obj.columnNameList = [obj.columnNameList];
-      }
-      result.push(obj);
-    }
+    });
     return result;
   }
 

From ff03f07b3fa153838841764fbfbda0209ff5adb3 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Wed, 14 Aug 2024 14:22:23 +0800
Subject: [PATCH 17/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods/domain/form/GoodsQueryForm.java     |  3 ++
 .../business/goods/service/GoodsService.java  |  2 +-
 .../mapper/business/goods/GoodsMapper.xml     |  2 +-
 .../deserializer/DictValueVoDeserializer.java |  8 ++--
 .../components/support/dict-select/index.vue  | 37 ++++---------------
 .../erp/goods/components/goods-form-modal.vue | 15 +++-----
 .../views/business/erp/goods/goods-list.vue   |  2 +-
 7 files changed, 22 insertions(+), 47 deletions(-)

diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsQueryForm.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsQueryForm.java
index 128939f8..6f61e100 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsQueryForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsQueryForm.java
@@ -1,9 +1,11 @@
 package net.lab1024.sa.admin.module.business.goods.domain.form;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
 import net.lab1024.sa.base.common.domain.PageParam;
+import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;
 import net.lab1024.sa.base.common.swagger.SchemaEnum;
 import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
 import org.hibernate.validator.constraints.Length;
@@ -32,6 +34,7 @@ public class GoodsQueryForm extends PageParam {
     private Integer goodsStatus;
 
     @Schema(description = "产地")
+    @JsonDeserialize(using = DictValueVoDeserializer.class)
     private String place;
 
     @Schema(description = "上架状态")
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java
index 8b7b2d34..497a168e 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java
@@ -199,7 +199,7 @@ public class GoodsService {
                         GoodsExcelVO.builder()
                                 .goodsStatus(SmartEnumUtil.getEnumDescByValue(e.getGoodsStatus(), GoodsStatusEnum.class))
                                 .categoryName(categoryQueryService.queryCategoryName(e.getCategoryId()))
-                                .place(dictCacheService.selectValueNameByValueCode(e.getPlace()))
+                                .place(Arrays.stream(e.getPlace().split(",")).map(code -> dictCacheService.selectValueNameByValueCode(code)).collect(Collectors.joining(",")))
                                 .price(e.getPrice())
                                 .goodsName(e.getGoodsName())
                                 .remark(e.getRemark())
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml b/smart-admin-api/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml
index 7fcadccb..05316d83 100644
--- a/smart-admin-api/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml
+++ b/smart-admin-api/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml
@@ -18,7 +18,7 @@
                 INSTR(goods_name,#{query.searchWord})
             </if>
             <if test="query.place != null">
-                AND place = #{query.place}
+                AND INSTR(place,#{query.place})
             </if>
             <if test="query.goodsStatus != null">
                 AND goods_status = #{query.goodsStatus}
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/DictValueVoDeserializer.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/DictValueVoDeserializer.java
index 86eba416..7631db6a 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/DictValueVoDeserializer.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/DictValueVoDeserializer.java
@@ -28,19 +28,19 @@ public class DictValueVoDeserializer extends JsonDeserializer<String> {
 
     @Override
     public String deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-        List<DictValueVO> list = new ArrayList<>();
+        List<String> list = new ArrayList<>();
         ObjectCodec objectCodec = jsonParser.getCodec();
         JsonNode listOrObjectNode = objectCodec.readTree(jsonParser);
         String deserialize = "";
         try {
             if (listOrObjectNode.isArray()) {
                 for (JsonNode node : listOrObjectNode) {
-                    list.add(objectCodec.treeToValue(node, DictValueVO.class));
+                    list.add(node.asText());
                 }
             } else {
-                list.add(objectCodec.treeToValue(listOrObjectNode, DictValueVO.class));
+                list.add(listOrObjectNode.asText());
             }
-            deserialize = list.stream().map(DictValueVO::getValueCode).collect(Collectors.joining(","));
+            deserialize = String.join(",", list);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             deserialize = listOrObjectNode.asText();
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue
index 004aadcb..72963a80 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue
@@ -64,24 +64,6 @@
     dictValueList.value = res.data;
   }
 
-  const values = computed(() => {
-    if (!props.value) {
-      return [];
-    }
-    if (!Array.isArray(props.value)) {
-      console.error('valueList is not array!!!');
-      return [];
-    }
-    let res = [];
-    if (props.value && props.value.length > 0) {
-      props.value.forEach((element) => {
-        res.push(element.valueCode);
-      });
-      return res;
-    }
-    return res;
-  });
-
   onMounted(queryDict);
 
   // -------------------------- 选中 相关、事件 --------------------------
@@ -96,21 +78,16 @@
 
   const emit = defineEmits(['update:value', 'change']);
   function onChange(value) {
-    let selected = [];
     if (!value) {
-      emit('update:value', selected);
-      emit('change', selected);
-      return selected;
+      emit('update:value', []);
+      emit('change', []);
     }
-    if (Array.isArray(props.value)) {
-      let valueList = dictValueList.value.filter((e) => value.includes(e.valueCode));
-      valueList = valueList.map((e) => e.valueCode);
-      emit('update:value', valueList);
-      emit('change', valueList);
+    if (Array.isArray(value)) {
+      emit('update:value', value);
+      emit('change', value);
     } else {
-      let findValue = dictValueList.value.find((e) => e.valueCode === value);
-      emit('update:value', findValue.valueCode);
-      emit('change', findValue.valueCode);
+      emit('update:value', [value]);
+      emit('change', [value]);
     }
   }
 </script>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/goods/components/goods-form-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/goods/components/goods-form-modal.vue
index f885e42a..c0a72c51 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/goods/components/goods-form-modal.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/goods/components/goods-form-modal.vue
@@ -20,7 +20,7 @@
         <SmartEnumSelect enum-name="GOODS_STATUS_ENUM" v-model:value="form.goodsStatus" />
       </a-form-item>
       <a-form-item label="产地" name="place">
-        <DictSelect key-code="GODOS_PLACE" v-model:value="form.place" />
+        <DictSelect width="100%" key-code="GODOS_PLACE" v-model:value="form.place" mode="tags" />
       </a-form-item>
       <a-form-item label="上架状态" name="shelvesFlag">
         <a-radio-group v-model:value="form.shelvesFlag">
@@ -80,7 +80,7 @@
     //商品状态
     goodsStatus: GOODS_STATUS_ENUM.APPOINTMENT.value,
     //产地
-    place: undefined,
+    place: [],
     //商品价格
     price: undefined,
     //上架状态
@@ -107,9 +107,8 @@
       Object.assign(form, rowData);
     }
     if (form.place && form.place.length > 0) {
-      form.place = form.place[0].valueCode;
+      form.place = form.place.map((e) => e.valueCode);
     }
-    console.log(form);
     visible.value = true;
     nextTick(() => {
       formRef.value.clearValidate();
@@ -127,14 +126,10 @@
       .then(async () => {
         SmartLoading.show();
         try {
-          let params = _.cloneDeep(form);
-          if (params.place && Array.isArray(params.place) && params.place.length > 0) {
-            params.place = params.place[0].valueCode;
-          }
           if (form.goodsId) {
-            await goodsApi.updateGoods(params);
+            await goodsApi.updateGoods(form);
           } else {
-            await goodsApi.addGoods(params);
+            await goodsApi.addGoods(form);
           }
           message.success(`${form.goodsId ? '修改' : '添加'}成功`);
           onClose();
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/goods/goods-list.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/goods/goods-list.vue
index 1110f72d..7fcafd7e 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/goods/goods-list.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/goods/goods-list.vue
@@ -109,7 +109,7 @@
     >
       <template #bodyCell="{ text, record, column }">
         <template v-if="column.dataIndex === 'place'">
-          <span>{{ text && text.length > 0 ? text[0].valueName : '' }}</span>
+          <span>{{ text && text.length > 0 ? text.map((e) => e.valueName).join(',') : '' }}</span>
         </template>
         <template v-if="column.dataIndex === 'goodsStatus'">
           <span>{{ $smartEnumPlugin.getDescByValue('GOODS_STATUS_ENUM', text) }}</span>

From 66cd067fa139ece7151d23da5093ccaef8a01fbd Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Wed, 14 Aug 2024 14:54:56 +0800
Subject: [PATCH 18/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E6=A8=A1=E5=9D=97=EF=BC=9A1?=
 =?UTF-8?q?=E3=80=81=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E6=94=AF=E6=8C=81=E5=88=B7=E6=96=B0=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=EF=BC=9B2=E3=80=81=E4=BF=AE=E6=94=B9=20Mapper.xml=20?=
 =?UTF-8?q?=E4=B8=AD=E5=AD=97=E5=85=B8=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=9B3=E3=80=81=E5=85=B6=E5=AE=83=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/CodeGeneratorTemplateService.java |  15 +-
 .../backend/domain/MapperVariableService.java |  10 +-
 .../domain/QueryFormVariableService.java      |  18 +-
 .../variable/front/FormVariableService.java   |   9 +-
 .../variable/front/ListVariableService.java   |  13 +-
 .../java/controller/Controller.java.vm        |   2 +-
 .../java/mapper/Mapper.xml.vm                 |   7 +-
 .../code-generator-template/js/form.vue.vm    | 233 +++++++++---------
 .../code-generator-template/js/list.vue.vm    |  19 +-
 .../support/dict-key-select/index.vue         |   6 +-
 .../code-generator/code-generator-util.js     |   2 +-
 ...ode-generator-table-config-form-delete.vue |   2 +-
 ...code-generator-table-config-form-field.vue |  11 +-
 .../preview/code-generator-preview-modal.vue  |   4 +-
 14 files changed, 200 insertions(+), 151 deletions(-)

diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
index ecad0c44..e83f67ab 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
@@ -13,16 +13,13 @@ import net.lab1024.sa.base.common.util.SmartStringUtil;
 import net.lab1024.sa.base.module.support.codegenerator.domain.entity.CodeGeneratorConfigEntity;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.*;
-import net.lab1024.sa.base.module.support.codegenerator.service.variable.backend.ControllerVariableService;
-import net.lab1024.sa.base.module.support.codegenerator.service.variable.backend.DaoVariableService;
-import net.lab1024.sa.base.module.support.codegenerator.service.variable.backend.ManagerVariableService;
-import net.lab1024.sa.base.module.support.codegenerator.service.variable.backend.ServiceVariableService;
+import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
+import net.lab1024.sa.base.module.support.codegenerator.service.variable.backend.*;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.backend.domain.*;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.front.ApiVariableService;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.front.ConstVariableService;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.front.FormVariableService;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.front.ListVariableService;
-import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
 import net.lab1024.sa.base.module.support.codegenerator.util.CodeGeneratorTool;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.velocity.Template;
@@ -36,7 +33,7 @@ import javax.annotation.PostConstruct;
 import java.io.File;
 import java.io.OutputStream;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -47,7 +44,7 @@ import java.util.stream.Collectors;
  * @Date 2022-06-30 22:15:38
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 
 @Service
@@ -94,7 +91,7 @@ public class CodeGeneratorTemplateService {
                 String fileName = templateFile.startsWith("java") ? upperCamel + templateSplit[templateSplit.length - 1] : lowerHyphen + "-" + templateSplit[templateSplit.length - 1];
                 String fullPathFileName = templateFile.replaceAll(templateSplit[templateSplit.length - 1], fileName);
                 fullPathFileName = fullPathFileName.replaceAll("java/", "java/" + basic.getModuleName().toLowerCase() + "/");
-                fullPathFileName = fullPathFileName.replaceAll("js/", "js/" + basic.getModuleName().toLowerCase() + "/");
+                fullPathFileName = fullPathFileName.replaceAll("js/", "js/" + lowerHyphen + "/");
 
                 String fileContent = generate(tableName, templateFile, codeGeneratorConfigEntity);
                 File file = new File(uuid + "/" + fullPathFileName);
@@ -130,7 +127,7 @@ public class CodeGeneratorTemplateService {
         }
 
 
-        ZipUtil.zip(outputStream, Charset.forName("utf-8"), false, null, dir);
+        ZipUtil.zip(outputStream, StandardCharsets.UTF_8, false, null, dir);
 
         FileUtil.del(dir);
 
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java
index c6371d98..14f8ff5f 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java
@@ -65,7 +65,15 @@ public class MapperVariableService extends CodeGenerateBaseVariableService {
                     stringBuilder.append("\n            )");
                 }
                 fieldMap.put("likeStr", stringBuilder.toString());
-            } else {
+            } else if (CodeQueryFieldQueryTypeEnum.DICT.equalsValue(queryField.getQueryTypeEnum())) {
+                String stringBuilder = "AND INSTR(" +
+                        form.getTableName() + "." + queryField.getColumnNameList().get(0) +
+                        ",#{queryForm." +
+                        queryField.getFieldName() +
+                        "})";
+                fieldMap.put("likeStr", stringBuilder);
+            }
+            else {
                 fieldMap.put("columnName", queryField.getColumnNameList().get(0));
             }
         }
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java
index 24d74e5d..86780e0a 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java
@@ -2,6 +2,7 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable.backen
 
 import cn.hutool.core.bean.BeanUtil;
 import net.lab1024.sa.base.common.util.SmartEnumUtil;
+import net.lab1024.sa.base.common.util.SmartStringUtil;
 import net.lab1024.sa.base.module.support.codegenerator.constant.CodeQueryFieldQueryTypeEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
@@ -41,14 +42,11 @@ public class QueryFormVariableService extends CodeGenerateBaseVariableService {
 
 
     public ImmutablePair<List<String>, List<Map<String, Object>>> getPackageListAndFields(CodeGeneratorConfigForm form) {
+
         List<CodeQueryField> fields = form.getQueryFields();
-        if (CollectionUtils.isEmpty(fields)) {
-            return ImmutablePair.of(new ArrayList<>(), new ArrayList<>());
-        }
 
         HashSet<String> packageList = new HashSet<>();
 
-
         /**
          * 1、LocalDate、LocalDateTime、BigDecimal 类型的包名
          * 2、排序
@@ -106,6 +104,14 @@ public class QueryFormVariableService extends CodeGenerateBaseVariableService {
 
                     finalFieldMap.put("javaType", codeField.getJavaType());
                     break;
+                case DICT:
+                    codeField = getCodeFieldByColumnName(field.getColumnNameList().get(0), form);
+                    if (SmartStringUtil.isNotEmpty(codeField.getDict())) {
+                        finalFieldMap.put("dict", "\n    @JsonDeserialize(using = DictValueVoDeserializer.class)");
+                        packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
+                        packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;");
+                    }
+                    finalFieldMap.put("javaType", "String");
                 default:
                     finalFieldMap.put("javaType", "String");
             }
@@ -113,13 +119,11 @@ public class QueryFormVariableService extends CodeGenerateBaseVariableService {
             finalFieldList.add(finalFieldMap);
         }
 
-
         // lombok
         packageList.add("import lombok.Data;");
         packageList.add("import lombok.EqualsAndHashCode;");
 
-        List<String> packageNameList = packageList.stream().filter(Objects::nonNull).collect(Collectors.toList());
-        Collections.sort(packageNameList);
+        List<String> packageNameList = packageList.stream().filter(Objects::nonNull).sorted().collect(Collectors.toList());
         return ImmutablePair.of(packageNameList, finalFieldList);
     }
 
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java
index 58ee1f0b..bdd4363f 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java
@@ -57,19 +57,20 @@ public class FormVariableService extends CodeGenerateBaseVariableService {
 
             fieldsVariableList.add(objectMap);
 
-            if (CodeFrontComponentEnum.ENUM_SELECT.getValue().equals(field.getFrontComponent())) {
+            if (CodeFrontComponentEnum.ENUM_SELECT.equalsValue(field.getFrontComponent())) {
                 frontImportSet.add("import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';");
             }
 
-            if (CodeFrontComponentEnum.BOOLEAN_SELECT.getValue().equals(field.getFrontComponent())) {
+            if (CodeFrontComponentEnum.BOOLEAN_SELECT.equalsValue(field.getFrontComponent())) {
                 frontImportSet.add("import BooleanSelect from '/@/components/framework/boolean-select/index.vue';");
             }
 
-            if (CodeFrontComponentEnum.DICT_SELECT.getValue().equals(field.getFrontComponent())) {
+            if (CodeFrontComponentEnum.DICT_SELECT.equalsValue(field.getFrontComponent())) {
                 frontImportSet.add("import DictSelect from '/@/components/support/dict-select/index.vue';");
             }
 
-            if (CodeFrontComponentEnum.FILE_UPLOAD.getValue().equals(field.getFrontComponent())) {
+            if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent())) {
+                frontImportSet.add("import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';");
                 frontImportSet.add("import FileUpload from '/@/components/support/file-upload/index.vue';");
             }
         }
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java
index 170fb363..74e582ad 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.google.common.base.CaseFormat;
 import net.lab1024.sa.base.module.support.codegenerator.constant.CodeQueryFieldQueryTypeEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
+import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeQueryField;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
 
@@ -35,19 +36,23 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
 
         for (CodeQueryField queryField : queryFields) {
             Map<String, Object> objectMap = BeanUtil.beanToMap(queryField);
-            variableList.add(objectMap);
 
-            if("Enum".equals(queryField.getQueryTypeEnum())){
+            CodeField codeField = getCodeFieldByColumnName(queryField.getColumnNameList().get(0), form);
+            objectMap.put("frontEnumName", codeField.getEnumName());
+            objectMap.put("dict", codeField.getDict());
+
+            if(CodeQueryFieldQueryTypeEnum.ENUM.equalsValue(queryField.getQueryTypeEnum())){
                 frontImportSet.add("import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';");
             }
 
-            if("Dict".equals(queryField.getQueryTypeEnum())){
+            if(CodeQueryFieldQueryTypeEnum.DICT.equalsValue(queryField.getQueryTypeEnum())){
                 frontImportSet.add("import DictSelect from '/@/components/support/dict-select/index.vue';");
             }
 
-            if(CodeQueryFieldQueryTypeEnum.DATE_RANGE.getValue().equals(queryField.getQueryTypeEnum())){
+            if(CodeQueryFieldQueryTypeEnum.DATE_RANGE.equalsValue(queryField.getQueryTypeEnum())){
                 frontImportSet.add("import { defaultTimeRanges } from '/@/lib/default-time-ranges';");
             }
+            variableList.add(objectMap);
 
         }
         variablesMap.put("queryFields",variableList);
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/controller/Controller.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/controller/Controller.java.vm
index b6296487..c6180908 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/controller/Controller.java.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/controller/Controller.java.vm
@@ -23,7 +23,7 @@ import javax.validation.Valid;
  */
 
 @RestController
-@Tag(name = "")
+@Tag(name = "${basic.description}")
 public class ${name.upperCamel}Controller {
 
     @Resource
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm
index 0a205951..7a827122 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm
@@ -23,7 +23,12 @@
                 ${queryField.likeStr}
             </if>
 #end
-#if(${queryField.queryTypeEnum} == "Equal" || ${queryField.queryTypeEnum} == "Enum" || ${queryField.queryTypeEnum} == "Dict")
+#if(${queryField.queryTypeEnum} == "Dict")
+            <if test="queryForm.${queryField.fieldName} != null and queryForm.${queryField.fieldName} != ''">
+                ${queryField.likeStr}
+            </if>
+#end
+#if(${queryField.queryTypeEnum} == "Equal" || ${queryField.queryTypeEnum} == "Enum")
             <if test="queryForm.${queryField.fieldName} != null">
                 AND ${tableName}.${queryField.columnName} = #{queryForm.${queryField.fieldName}}
             </if>
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
index ea0b2d1d..da0a1480 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
@@ -19,124 +19,121 @@
       :destroyOnClose="true"
   >
     <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" >
-        #if($insertAndUpdate.countPerLine == 1)
-          <a-row>
-          #foreach ($field in $formFields)
-              #if($field.frontComponent == "Input")
-                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                  <a-input style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
-                </a-form-item>
-              #end
-              #if($field.frontComponent == "InputNumber")
-                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                  <a-input-number style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
-                </a-form-item>
-              #end
-              #if($field.frontComponent == "Textarea")
-                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                  <a-textarea style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
-                </a-form-item>
-              #end
-              #if($field.frontComponent == "BooleanSelect")
-                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                  <BooleanSelect v-model:value="form.${field.fieldName}" style="width: 100%" />
-                </a-form-item>
-              #end
-              #if($field.frontComponent == "SmartEnumSelect")
-                <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-                  <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
-                </a-form-item>
-              #end
-              #if($field.frontComponent == "DictSelect")
-                <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-                  <DictSelect width="100%" v-model:value="form.${field.fieldName}" keyCode="$!{field.dict}" placeholder="$!{field.label}"/>
-                </a-form-item>
-              #end
-              #if($field.frontComponent == "Date")
-                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                  <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}"/>
-                </a-form-item>
-              #end
-              #if($field.frontComponent == "DateTime")
-                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                  <a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
-                </a-form-item>
-              #end
-              #if($field.frontComponent == "FileUpload")
-                <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                  <FileUpload
-                      :defaultFileList="form.$!{field.fieldName}"
-                      :folder="FILE_FOLDER_TYPE_ENUM.COMMON.value"
-                      buttonText="上传 $!{field.label}"
-                      listType="text"
-                      @change="e => form.$!{field.fieldName} = e"
-                  />
-                </a-form-item>
-              #end
-          #end
-          </a-row>
+#if($insertAndUpdate.countPerLine == 1)
+  #foreach ($field in $formFields)
+      #if($field.frontComponent == "Input")
+        <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+          <a-input style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
+        </a-form-item>
+      #end
+      #if($field.frontComponent == "InputNumber")
+        <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+          <a-input-number style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
+        </a-form-item>
+      #end
+      #if($field.frontComponent == "Textarea")
+        <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+          <a-textarea style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
+        </a-form-item>
+      #end
+      #if($field.frontComponent == "BooleanSelect")
+        <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+          <BooleanSelect v-model:value="form.${field.fieldName}" style="width: 100%" />
+        </a-form-item>
+      #end
+      #if($field.frontComponent == "SmartEnumSelect")
+        <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
+          <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
+        </a-form-item>
+      #end
+      #if($field.frontComponent == "DictSelect")
+        <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
+          <DictSelect width="100%" v-model:value="form.${field.fieldName}" keyCode="$!{field.dict}" placeholder="$!{field.label}"/>
+        </a-form-item>
+      #end
+      #if($field.frontComponent == "Date")
+        <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+          <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}"/>
+        </a-form-item>
+      #end
+      #if($field.frontComponent == "DateTime")
+        <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+          <a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
+        </a-form-item>
+      #end
+      #if($field.frontComponent == "FileUpload")
+        <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+          <FileUpload
+              :defaultFileList="form.$!{field.fieldName}"
+              :folder="FILE_FOLDER_TYPE_ENUM.COMMON.value"
+              buttonText="上传 $!{field.label}"
+              listType="text"
+              @change="e => form.$!{field.fieldName} = e"
+          />
+        </a-form-item>
+      #end
+  #end
+#end
+    #if($insertAndUpdate.countPerLine > 1)
+      <a-row>
+          #set($span=24 / $!insertAndUpdate.countPerLine )
+      #foreach ($field in $formFields)
+        <a-col :span="$!{span}">
+        #if($field.frontComponent == "Input")
+          <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+            <a-input style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
+          </a-form-item>
         #end
-
-        #if($insertAndUpdate.countPerLine > 1)
-          <a-row>
-              #set($span=24 / $!insertAndUpdate.countPerLine )
-              #foreach ($field in $formFields)
-                <a-col :span="$!{span}">
-                    #if($field.frontComponent == "Input")
-                      <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                        <a-input style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
-                      </a-form-item>
-                    #end
-                    #if($field.frontComponent == "InputNumber")
-                      <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                        <a-input-number style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
-                      </a-form-item>
-                    #end
-                    #if($field.frontComponent == "Textarea")
-                      <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                        <a-textarea style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
-                      </a-form-item>
-                    #end
-                    #if($field.frontComponent == "BooleanSelect")
-                      <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                        <BooleanSelect v-model:value="form.${field.fieldName}" style="width: 100%" />
-                      </a-form-item>
-                    #end
-                    #if($field.frontComponent == "SmartEnumSelect")
-                      <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-                        <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
-                      </a-form-item>
-                    #end
-                    #if($field.frontComponent == "DictSelect")
-                      <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
-                        <DictSelect width="100%" v-model:value="form.${field.fieldName}" keyCode="$!{field.dict}" placeholder="$!{field.label}"/>
-                      </a-form-item>
-                    #end
-                    #if($field.frontComponent == "Date")
-                      <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                        <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}"/>
-                      </a-form-item>
-                    #end
-                    #if($field.frontComponent == "DateTime")
-                      <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                        <a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
-                      </a-form-item>
-                    #end
-                    #if($field.frontComponent == "FileUpload")
-                      <a-form-item label="$!{field.label}"  name="${field.fieldName}">
-                        <FileUpload
-                            :defaultFileList="form.$!{field.fieldName}"
-                            :folder="FILE_FOLDER_TYPE_ENUM.COMMON.value"
-                            buttonText="上传 $!{field.label}"
-                            listType="text"
-                            @change="e => form.$!{field.fieldName} = e"
-                        />
-                      </a-form-item>
-                    #end
-                </a-col>
-              #end
-          </a-row>
+        #if($field.frontComponent == "InputNumber")
+          <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+            <a-input-number style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
+          </a-form-item>
         #end
+        #if($field.frontComponent == "Textarea")
+          <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+            <a-textarea style="width: 100%" v-model:value="form.${field.fieldName}" placeholder="$!{field.label}" />
+          </a-form-item>
+        #end
+        #if($field.frontComponent == "BooleanSelect")
+          <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+            <BooleanSelect v-model:value="form.${field.fieldName}" style="width: 100%" />
+          </a-form-item>
+        #end
+        #if($field.frontComponent == "SmartEnumSelect")
+          <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
+            <SmartEnumSelect width="100%" v-model:value="form.${field.fieldName}" enumName="$!{field.upperUnderscoreEnum}" placeholder="$codeGeneratorTool.removeEnumDesc($!{field.label})"/>
+          </a-form-item>
+        #end
+        #if($field.frontComponent == "DictSelect")
+          <a-form-item label="$codeGeneratorTool.removeEnumDesc($!{field.label})"  name="${field.fieldName}">
+            <DictSelect width="100%" v-model:value="form.${field.fieldName}" keyCode="$!{field.dict}" placeholder="$!{field.label}"/>
+          </a-form-item>
+        #end
+        #if($field.frontComponent == "Date")
+          <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+            <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}"/>
+          </a-form-item>
+        #end
+        #if($field.frontComponent == "DateTime")
+          <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+            <a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
+          </a-form-item>
+        #end
+        #if($field.frontComponent == "FileUpload")
+          <a-form-item label="$!{field.label}"  name="${field.fieldName}">
+            <FileUpload
+                :defaultFileList="form.$!{field.fieldName}"
+                :folder="FILE_FOLDER_TYPE_ENUM.COMMON.value"
+                buttonText="上传 $!{field.label}"
+                listType="text"
+                @change="e => form.$!{field.fieldName} = e"
+            />
+          </a-form-item>
+        #end
+        </a-col>
+      #end
+      </a-row>
+    #end
     </a-form>
 
     <template #footer>
@@ -171,6 +168,10 @@
     if (rowData && !_.isEmpty(rowData)) {
       Object.assign(form, rowData);
     }
+    // 使用字典时把下面这注释修改成自己的字典字段 有多个字典字段就复制多份同理修改 不然打开表单时不显示字典初始值
+    // if (form.status && form.status.length > 0) {
+    //   form.status = form.status.map((e) => e.valueCode);
+    // }
     visibleFlag.value = true;
     nextTick(() => {
       formRef.value.clearValidate();
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
index 15367104..0b425017 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
@@ -72,7 +72,7 @@
                 </a-button>
 #end
 #if($deleteInfo.isSupportDelete && ($deleteInfo.deleteEnum == "Batch"||$deleteInfo.deleteEnum == "SingleAndBatch"))
-                <a-button @click="confirmBatchDelete" type="danger" size="small" :disabled="selectedRowKeyList.length == 0">
+                <a-button @click="confirmBatchDelete" type="primary" danger size="small" :disabled="selectedRowKeyList.length == 0">
                     <template #icon>
                         <DeleteOutlined />
                     </template>
@@ -99,7 +99,21 @@
             :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
 #end
         >
-            <template #bodyCell="{ record, column }">
+            <template #bodyCell="{ text, record, column }">
+
+	    <!-- 有图片预览时 注释解开并把下面的'picture'修改成自己的图片字段名即可 -->
+              <!-- <template v-if="column.dataIndex === 'picture'">
+                  <FilePreview :fileList="text" type="picture" />
+                </template> -->
+
+	    <!-- 使用字典时 注释解开并把下面的'dict'修改成自己的字典字段名即可 有多个字典字段就复制多份同理修改 不然不显示字典 -->
+              <!-- 方便修改tag的颜色 orange green purple success processing error default warning -->
+              <!-- <template v-if="column.dataIndex === 'dict'">
+                <a-tag color="cyan">
+                  {{ text && text.length > 0 ? text.map((e) => e.valueName).join(',') : '暂无' }}
+                </a-tag>
+              </template> -->
+
                 <template v-if="column.dataIndex === 'action'">
                     <div class="smart-table-operate">
 #if($insertAndUpdate.isSupportInsertAndUpdate)
@@ -145,6 +159,7 @@
 #foreach ($import in $frontImportList)
     $!{import}
 #end
+    //import FilePreview from '/@/components/support/file-preview/index.vue'; // 图片预览组件
 
     // ---------------------------- 表格列 ----------------------------
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-key-select/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-key-select/index.vue
index 1c2dffc5..2fd3eb24 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-key-select/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-key-select/index.vue
@@ -27,9 +27,13 @@
 </template>
 
 <script setup>
-  import { computed, onMounted, ref, watch } from 'vue';
+  import { computed, onMounted, ref, watch, defineExpose } from 'vue';
   import { dictApi } from '/src/api/support/dict-api';
 
+  defineExpose({
+    queryDict,
+  });
+
   const props = defineProps({
     value: [Array, String],
     placeholder: {
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js
index 555d4457..1845676b 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js
@@ -86,7 +86,7 @@ FrontComponentMap.set('varchar', 'Input');
 FrontComponentMap.set('tinytext', 'Input');
 FrontComponentMap.set('text', 'Textarea');
 FrontComponentMap.set('longtext', 'Textarea');
-FrontComponentMap.set('blob', 'Upload');
+FrontComponentMap.set('blob', 'FileUpload');
 FrontComponentMap.set('date', 'Date');
 FrontComponentMap.set('datetime', 'DateTime');
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
index b289780e..f0464847 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
@@ -73,7 +73,7 @@
     //表单
     let deleteInfo = config.deleteInfo;
 
-    formData.isSupportDelete = deleteInfo && deleteInfo.isSupportDelete;
+    formData.isSupportDelete = deleteInfo ? deleteInfo.isSupportDelete : true;
     formData.isPhysicallyDeleted = deleteInfo && deleteInfo.isPhysicallyDeleted ? deleteInfo.isPhysicallyDeleted : !deletedFlagColumn;
     formData.deleteEnum = deleteInfo && deleteInfo.deleteEnum ? deleteInfo.deleteEnum : CODE_DELETE_ENUM.SINGLE_AND_BATCH.value;
   }
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
index 34fe3584..efcbbc0b 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
@@ -11,6 +11,10 @@
   <a-alert :closable="true" message="请务必将每一个字段的 “ 字段名词 ” 填写完整！！！" type="success" show-icon>
     <template #icon><smile-outlined /></template>
   </a-alert>
+  <!-- 为了方便再配置时中途新增字典后 可以重新刷新字典下拉 (需要先随便选择一个字典后才能看到最新的字典) -->
+  <div style="float: right; padding: 10px 0px">
+    <a-button type="primary" @click="refreshDict">刷新字典</a-button>
+  </div>
   <a-table
     :scroll="{ x: 1300 }"
     size="small"
@@ -64,7 +68,7 @@
       </template>
 
       <template v-if="column.dataIndex === 'dict'">
-        <DictKeySelect v-model:value="record.dict" />
+        <DictKeySelect ref="dictRef" v-model:value="record.dict" />
       </template>
 
       <template v-if="column.dataIndex === 'enumName'">
@@ -81,6 +85,11 @@
   import { convertUpperCamel, convertLowerCamel } from '/@/utils/str-util';
   import _ from 'lodash';
 
+  const dictRef = ref();
+  function refreshDict() {
+    dictRef.value.queryDict();
+  }
+
   //------------------------ 全局数据 ---------------------
   const tableInfo = inject('tableInfo');
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
index 99b9ed3f..51dac891 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
@@ -37,9 +37,9 @@
 </template>
 
 <script setup>
-  import { computed, nextTick, ref, watch } from 'vue';
+  import { computed, nextTick, ref } from 'vue';
   import { codeGeneratorApi } from '/@/api/support/code-generator-api';
-  import { JAVA_FILE_LIST, LANGUAGE_LIST, JS_FILE_LIST, TS_FILE_LIST, JAVA_DOMAIN_FILE_LIST } from '../../code-generator-util';
+  import { JAVA_FILE_LIST, LANGUAGE_LIST, JS_FILE_LIST, TS_FILE_LIST } from '../../code-generator-util';
   import { smartSentry } from '/@/lib/smart-sentry';
   import { lineNumbersBlock } from '/@/lib/highlight-line-number';
   import hljs from 'highlight.js';

From b16d8a6128d3140bf83aa25449c186a2869d83ec Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Wed, 14 Aug 2024 14:58:10 +0800
Subject: [PATCH 19/22] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sa/base/module/support/job/core/SmartJobExecutor.java     | 2 ++
 .../src/components/framework/wangeditor/index.vue             | 1 -
 .../src/views/system/account/components/message/index.vue     | 2 +-
 .../src/views/system/menu/components/menu-operate-modal.vue   | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java
index c2508af9..721410a8 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java
@@ -142,6 +142,8 @@ public class SmartJobExecutor implements Runnable {
         logEntity.setSuccessFlag(true);
         // 执行开始时间
         logEntity.setExecuteStartTime(executeTime);
+        logEntity.setExecuteEndTime(executeTime);
+        logEntity.setExecuteTimeMillis(0L);
         logEntity.setCreateName(executorName);
         logEntity.setIp(SmartIpUtil.getLocalFirstIp());
         logEntity.setProcessId(SmartJobUtil.getProcessId());
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/wangeditor/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/components/framework/wangeditor/index.vue
index 6da8f0ab..2ecdeac6 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/wangeditor/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/components/framework/wangeditor/index.vue
@@ -61,7 +61,6 @@
   watch(
     () => props.modelValue,
     (nVal) => {
-      console.log(nVal);
       editorHtml.value = nVal;
     },
     {
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/index.vue
index da4dc552..4156bccb 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/index.vue
@@ -6,7 +6,7 @@
       </a-form-item>
 
       <a-form-item label="类型" class="smart-query-form-item">
-        <smart-enum-select v-model:value="queryForm.messageType" placeholder="消息类型" enum-name="MESSAGE_TYPE_ENUM" />
+        <smart-enum-select style="width: 150px" v-model:value="queryForm.messageType" placeholder="消息类型" enum-name="MESSAGE_TYPE_ENUM" />
       </a-form-item>
 
       <a-form-item label="消息时间" class="smart-query-form-item">
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue
index b6f740ae..2cee271b 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue
@@ -61,7 +61,7 @@
           <a-switch v-model:checked="form.visibleFlag" checked-children="显示" un-checked-children="不显示" />
         </a-form-item>
         <a-form-item label="禁用状态" name="frameFlag">
-          <a-switch v-model:checked="form.disabledFlag" checked-children="启用" un-checked-children="禁用" />
+          <a-switch v-model:checked="form.disabledFlag" :checkedValue="false" :unCheckedValue="true" checked-children="启用" un-checked-children="禁用" />
         </a-form-item>
       </template>
       <!--      目录 菜单 end   -->
@@ -74,7 +74,7 @@
           <MenuTreeSelect ref="contextMenuTreeSelect" v-model:value="form.contextMenuId" />
         </a-form-item>
         <a-form-item label="功能点状态" name="frameFlag">
-          <a-switch v-model:checked="form.disabledFlag" checked-children="启用" un-checked-children="禁用" />
+          <a-switch v-model:checked="form.disabledFlag" :checkedValue="false" :unCheckedValue="true" checked-children="启用" un-checked-children="禁用" />
         </a-form-item>
         <a-form-item label="权限类型" name="permsType">
           <a-radio-group v-model:value="form.permsType">

From be56a0b505507d85895678fe40b5f7bad5bb5282 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Wed, 14 Aug 2024 15:09:14 +0800
Subject: [PATCH 20/22] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=EF=BC=9A1=E3=80=81?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=94=9F=E6=88=90=E8=8F=9C=E5=8D=95SQL?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81Controller=20=E4=BB=A3=E7=A0=81=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/CodeGeneratorTemplateService.java |  2 ++
 .../variable/backend/MenuVariableService.java | 27 +++++++++++++++++++
 .../java/controller/Controller.java.vm        |  6 +++++
 .../java/sql/Menu.sql.vm                      | 22 +++++++++++++++
 .../code-generator/code-generator-util.js     |  1 +
 5 files changed, 58 insertions(+)
 create mode 100644 smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/MenuVariableService.java
 create mode 100644 smart-admin-api/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm

diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
index e83f67ab..5a86305c 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
@@ -67,6 +67,8 @@ public class CodeGeneratorTemplateService {
         map.put("java/manager/Manager.java", new ManagerVariableService());
         map.put("java/dao/Dao.java", new DaoVariableService());
         map.put("java/mapper/Mapper.xml", new MapperVariableService());
+        // 菜单 SQL
+        map.put("java/sql/Menu.sql", new MenuVariableService());
         // 前端
         map.put("js/api.js", new ApiVariableService());
         map.put("js/const.js", new ConstVariableService());
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/MenuVariableService.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/MenuVariableService.java
new file mode 100644
index 00000000..17ab19f2
--- /dev/null
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/MenuVariableService.java
@@ -0,0 +1,27 @@
+package net.lab1024.sa.base.module.support.codegenerator.service.variable.backend;
+
+import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
+import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 目前暂时没用到 这是一个空实现
+ *
+ * @author zhoumingfa
+ * @date 2024/8/13
+ */
+public class MenuVariableService extends CodeGenerateBaseVariableService {
+
+    @Override
+    public boolean isSupport(CodeGeneratorConfigForm form) {
+        return true;
+    }
+
+    @Override
+    public Map<String, Object> getInjectVariablesMap(CodeGeneratorConfigForm form) {
+        return new HashMap<>(2);
+    }
+
+}
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/controller/Controller.java.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/controller/Controller.java.vm
index c6180908..13ccc5b8 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/controller/Controller.java.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/controller/Controller.java.vm
@@ -3,6 +3,7 @@ package ${packageName};
 #foreach ($importClass in $importPackageList)
 $importClass
 #end
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.domain.PageResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,6 +32,7 @@ public class ${name.upperCamel}Controller {
 
     @Operation(summary = "分页查询 @author ${basic.backendAuthor}")
     @PostMapping("/${name.lowerCamel}/queryPage")
+    @SaCheckPermission("${name.lowerCamel}:query")
     public ResponseDTO<PageResult<${name.upperCamel}VO>> queryPage(@RequestBody @Valid ${name.upperCamel}QueryForm queryForm) {
         return ResponseDTO.ok(${name.lowerCamel}Service.queryPage(queryForm));
     }
@@ -38,12 +40,14 @@ public class ${name.upperCamel}Controller {
 #if($insertAndUpdate.isSupportInsertAndUpdate)
     @Operation(summary = "添加 @author ${basic.backendAuthor}")
     @PostMapping("/${name.lowerCamel}/add")
+    @SaCheckPermission("${name.lowerCamel}:add")
     public ResponseDTO<String> add(@RequestBody @Valid ${name.upperCamel}AddForm addForm) {
         return ${name.lowerCamel}Service.add(addForm);
     }
 
     @Operation(summary = "更新 @author ${basic.backendAuthor}")
     @PostMapping("/${name.lowerCamel}/update")
+    @SaCheckPermission("${name.lowerCamel}:update")
     public ResponseDTO<String> update(@RequestBody @Valid ${name.upperCamel}UpdateForm updateForm) {
         return ${name.lowerCamel}Service.update(updateForm);
     }
@@ -53,6 +57,7 @@ public class ${name.upperCamel}Controller {
     #if($deleteInfo.deleteEnum == "Batch" || $deleteInfo.deleteEnum == "SingleAndBatch")
     @Operation(summary = "批量删除 @author ${basic.backendAuthor}")
     @PostMapping("/${name.lowerCamel}/batchDelete")
+    @SaCheckPermission("${name.lowerCamel}:delete")
     public ResponseDTO<String> batchDelete(@RequestBody ValidateList<${primaryKeyJavaType}> idList) {
         return ${name.lowerCamel}Service.batchDelete(idList);
     }
@@ -61,6 +66,7 @@ public class ${name.upperCamel}Controller {
     #if($deleteInfo.deleteEnum == "Single" || $deleteInfo.deleteEnum == "SingleAndBatch")
     @Operation(summary = "单个删除 @author ${basic.backendAuthor}")
     @GetMapping("/${name.lowerCamel}/delete/{${primaryKeyFieldName}}")
+    @SaCheckPermission("${name.lowerCamel}:delete")
     public ResponseDTO<String> batchDelete(@PathVariable ${primaryKeyJavaType} ${primaryKeyFieldName}) {
         return ${name.lowerCamel}Service.delete(${primaryKeyFieldName});
     }
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
new file mode 100644
index 00000000..90525f78
--- /dev/null
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
@@ -0,0 +1,22 @@
+# 默认是按前端工程文件的 /views/business 文件夹的路径作为前端组件路径，如果你没把生成的 .vue 前端代码放在 /views/business 下，
+# 那就根据自己实际情况修改下面 SQL 的 path,component 字段值，避免执行 SQL 后菜单无法访问。
+# 如果你一切都是按照默认，那么下面的 SQL 基本不用改
+
+INSERT INTO t_menu ( menu_name, menu_type, parent_id, path, component, frame_flag, cache_flag, visible_flag, disabled_flag, perms_type, create_user_id )
+VALUES ( '${basic.description}', 2, 0, '/${name.lowerHyphenCamel}/list', '/business/${name.lowerHyphenCamel}/${name.lowerHyphenCamel}-list.vue', false, false, true, false, 1, 1 );
+
+# 按菜单名称查询该菜单的 menu_id 作为按钮权限的 父菜单ID 与 功能点关联菜单ID
+SET @parent_id = NULL;
+SELECT t_menu.menu_id INTO @parent_id FROM t_menu WHERE t_menu.menu_name = '${basic.description}';
+
+INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
+VALUES ( '查询', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:query', 1, @parent_id, 1 );
+
+INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
+VALUES ( '添加', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:add', 1, @parent_id, 1 );
+
+INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
+VALUES ( '更新', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:update', 1, @parent_id, 1 );
+
+INSERT INTO t_menu ( menu_name, menu_type, parent_id, frame_flag, cache_flag, visible_flag, disabled_flag, api_perms, perms_type, context_menu_id, create_user_id )
+VALUES ( '删除', 3, @parent_id, false, true, true, false, '${name.lowerCamel}:delete', 1, @parent_id, 1 );
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js
index 1845676b..5c2942ba 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js
@@ -133,6 +133,7 @@ export const JAVA_FILE_LIST = [
   'Dao.java', //
   'Mapper.xml', //
   ...JAVA_DOMAIN_FILE_LIST,
+  'Menu.sql', //
 ];
 
 // -------------------------------- 枚举enum --------------------------------

From f4923487b4fc24f320a07ae39885c937b185990d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?1024=E5=88=9B=E6=96=B0=E5=AE=9E=E9=AA=8C=E5=AE=A4?=
 <1024lab@sina.com>
Date: Wed, 14 Aug 2024 15:09:36 +0000
Subject: [PATCH 21/22] update
 smart-admin-web/javascript-ant-design-vue3/.env.development.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 1024创新实验室 <1024lab@sina.com>
---
 smart-admin-web/javascript-ant-design-vue3/.env.development | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smart-admin-web/javascript-ant-design-vue3/.env.development b/smart-admin-web/javascript-ant-design-vue3/.env.development
index df615c53..7ae8066c 100644
--- a/smart-admin-web/javascript-ant-design-vue3/.env.development
+++ b/smart-admin-web/javascript-ant-design-vue3/.env.development
@@ -1,3 +1,3 @@
 NODE_ENV=development
 VITE_APP_TITLE='SmartAdmin 开发环境(Dev)'
-VITE_APP_API_URL='http://smartadmin.dev.1024lab.net/api/'
+VITE_APP_API_URL='http://127.0.0.1:1024'
\ No newline at end of file

From 3fcb764078174f74d397a14202954cf89dc377f3 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Fri, 16 Aug 2024 17:53:06 +0800
Subject: [PATCH 22/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=20form=20=E6=A8=A1=E6=9D=BF=E7=9A=84=20width?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/code-generator-template/js/form.vue.vm   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
index da0a1480..7567a12e 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
@@ -8,7 +8,7 @@
 <template>
   <a-$!{insertAndUpdate.pageType}
       :title="form.$!{primaryKeyFieldName} ? '编辑' : '添加'"
-      width="$!{insertAndUpdate.width}"
+      :width="$!{insertAndUpdate.width}"
       :open="visibleFlag"
       #if($!{insertAndUpdate.pageType} == 'drawer')
       @close="onClose"