【优化】代码格式优化

恢复
Revert "!22 sa-token"
2025-11-05 18:23:47 +08:00 · 2023-07-26 21:23:41 +08:00 · 2023-07-26 21:18:58 +08:00 · 2023-07-26 21:18:39 +08:00 · 2023-07-26 12:11:31 +00:00 · 2023-07-25 20:07:55 +08:00
1702 changed files with 137999 additions and 51472 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,26 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**
+!**/src/test/**

+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
 *.iml
+*.ipr

-**/target/
+### front ###
+**/dist
+**/node_modules
+**/.vscode

-**/node_modules/
--- a/README.md
+++ b/README.md
@@ -1,122 +1,101 @@
-#### 简介
-SmartAdmin由河南·洛阳 [1024创新实验室](https://www.1024lab.net/)团队研发的一套互联网企业级的通用型中后台解决方案！使用最前沿的前后台技术栈SpringBoot和Vue，前后端分离，<font color="#DC143C">**我们开源一套漂亮的代码和一套整洁的代码规范**</font>，让大家在这浮躁的代码世界里感受到一股把代码写好的清流！同时又让开发者节省大量的时间，减少加班，快乐工作，热爱生活。SmartAdmin 让你从认识到忘不了，绝对是你最想要的！
+### SmartAdmin
+**SmartAdmin** 由 **河南·洛阳** [1024 创新实验室](https://www.1024lab.net/) 使用SpringBoot2 和 Vue3 Setup语法糖、 Composition Api (同时支持JavaScript和TypeScript双版本) ，开发出的一套简洁、易用的低代码中后台解决方案！  

-#### 开源地址   (*欢迎 Star ~ ~  ╰(￣▽￣)╭*)
-github: [https://github.com/1024-lab/smart-admin](https://github.com/1024-lab/smart-admin)  
-gitee:  [https://gitee.com/lab1024/smart-admin](https://gitee.com/lab1024/smart-admin)  
-在线预览： [http://preview.smartadmin.1024lab.net](http://preview.smartadmin.1024lab.net)  
-部署文档：[http://smartadmin.1024lab.net/doc/1/68](http://smartadmin.1024lab.net/doc/1/68)
+**我们开源一套漂亮的代码和一套整洁的代码规范**，让大家在这浮躁的代码世界里感受到一股把代码写好的清流！同时又让开发者节省大量的时间，减少加班，快乐工作，保持谦逊，保持学习，**热爱代码，更热爱生活！**

-#### 疑惑
-有人问：又是个“轮子”？ 轮子靠谱吗？为什么要选择你这个轮子？
-<font color="#DC143C">**1024Lab**回答：
-它不是“轮子”，目的不是为了重复造轮子！ 我们开源的是一套 “漂亮的代码” 和 “代码规范”。
-</font>

-#### 理念与思想
- 我们分享的不是代码，不是徒劳无功的堆砌功能，而是你必须的基础功能，比如Vue前端权限、心跳、动态Reload、Keepalived标签页等等，可能还有一些正是你当前项目中缺失的功能。
- 我们分享的不仅有代码，还有一套经过几十人验证过的前、后端代码。细节决定成败，好的规范能让我们敲下的每行代码更铿锵有力！
- 我们推崇高质量的代码，身为开发，代码即利剑，键盘上一套行云流水，宛如侠客，事了拂衣去，深藏身与名。
- 我们推崇团队的高度配合默契、互相帮助，从不加班，而不是一看到别人的代码就头皮发麻，留其996.ICU
- 我们热爱编程，热爱代码，保持谦逊，不断学习，快乐工作，热爱生活。
- **请相信并认真阅读下面的每一个点，让你感受不一样的编码体验**
+在线预览：[https://preview.smartadmin.vip](https://preview.smartadmin.vip)  
+官方文档：[https://smartadmin.vip](https://smartadmin.vip)  

-#### 演示图
+### 理念与思想
+
+- 我们分享的不是徒劳无功的各种功能，而是必须有的功能，如：数据变动记录、系统说明文档、版本更新记录、意见反馈、日志、心跳、单号生成器等等。
+- 我们分享的还有经过上百家公司验证过的前端、后端、vue3等代码规范，好的规范能让我们敲下的每行代码更铿锵有力！
+- **我们推崇高质量的代码，身为开发，代码即利剑，键盘上一套行云流水，宛如侠客，事了拂衣去，深藏身与名。**
+- **我们推崇团队的高度配合默契、互相帮助，从不加班，而不是一看到别人的代码就头皮发麻，留其 [996.ICU](https://baike.baidu.com/item/996.ICU)，我们热爱代码，更热爱生活**
+
+### 演示图
 <table>
 <tr>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/cut/11.png"/></td>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/cut/12.png"/></td>
+  <td><img src="https://gitee.com/lab1024/smart-admin/raw/master/%E6%88%AA%E5%9B%BE/1-1.png"/></td>
+  <td><img src="https://gitee.com/lab1024/smart-admin/raw/master/%E6%88%AA%E5%9B%BE/2-1.png"/></td>
 </tr>
 <tr>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/cut/21.png"/></td>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/cut/22.png"/></td>
+  <td><img src="https://gitee.com/lab1024/smart-admin/raw/master/%E6%88%AA%E5%9B%BE/4-2.png"/></td>
+  <td><img src="https://gitee.com/lab1024/smart-admin/raw/master/%E6%88%AA%E5%9B%BE/3-1.png"/></td>
 </tr>
 <tr>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/cut/31.png"/></td>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/cut/32.png"/></td>
+  <td><img src="https://gitee.com/lab1024/smart-admin/raw/master/%E6%88%AA%E5%9B%BE/5-1.png"/></td>
+  <td><img src="https://gitee.com/lab1024/smart-admin/raw/master/%E6%88%AA%E5%9B%BE/6-1.png"/></td>
 </tr>
 <tr>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/cut/41.png"/></td>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/cut/42.png"/></td>
-</tr>
-<tr>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/cut/51.png"/></td>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/cut/52.png"/></td>
-</tr>
-<tr>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/cut/61.png"/></td>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/cut/62.png"/></td>
-</tr>
-<tr>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/cut/71.png"/></td>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/cut/72.png"/></td>
+  <td><img src="https://gitee.com/lab1024/smart-admin/raw/master/%E6%88%AA%E5%9B%BE/code1.png"/></td>
+  <td><img src="https://gitee.com/lab1024/smart-admin/raw/master/%E6%88%AA%E5%9B%BE/code2.png"/></td>
 </tr>
+
 </table>

+### 技术体系

-#### 技术体系
- 前端：Vue + Vue-Router + Vuex + ViewUI(iview) + vue-enum
- 后端：SpringBoot2 + Mybatis-plus + jwt + druid + mysql
- 前端代码规范smart-front-standard -guide（大力推荐）
- 基于阿里规范之上的后端规范smart-backend-standard-guide（大力推荐）
+- 前端：Vue3.2 + Vue-Router + Pinia + Ant Design Vue 3.X + Vite
+- 后端：Java8 + SpringBoot2.X + Mybatis-plus + jwt + druid + mysql

-#### 前端特点
- 高质量的代码、代码结构、和代码注释
- 漂亮的UI，菜单栏、标签页，体验、交互更好用的员工、部门、角色、菜单管理等等
- 优化基于Keepalive的标签页，做到标签页该缓存的时候缓存，比如左右切换等，不该缓存的时候不缓存，比如新建，表单提交结束等
- 前端常量维护: vue-enum，拒绝出现魔法数字，代码不可维护的现象
- 全新的基于前端的权限设计（忘掉传统的权限设计吧，已经不适合这个前端时代）
- 基于websocket的在线人数
- 支持一级、二级、三级菜单，单搜索功能
- 其他功能：邮件、富文本、消息、系统配置等等
- 写不完了，太多好的细节需要你的发现......
+### 功能特点

-#### 后端特点
- 高质量的Java代码、分包结构、和代码注释
+- 表格：持久化表格自定义列、国际化、水印 等
+- OA办公：公司信息（发票、银行、员工等）、通知公告（阅读记录、次数等）
+- 文档：系统手册、意见反馈、更新记录 等
+- 监控：心跳监控、数据库监控
+- 日志：登录日志、操作日志（IP、浏览器、操作系统等设备信息）
+- 系统：员工、部门、角色、权限、菜单 等
+- 工具：文件管理、系统参数、数据字典、单号生成 等
+- 代码生成： 基于每个表的配置、在线预览代码、下载 等
+- 更多请查看：[SmartAdmin 业内独有功能亮点](https://smartadmin.vip/views/v2/base/FunctionFeature.html)
+
+### 前端特点
+
+- 提供 js 和 ts 双版本，目录结构及其清晰
+- setup语法糖下Composition Api 代码规范可能只有我们写对了
+- 前端常量维护: vue-enum，拒绝出现魔法数字，常量枚举不可维护的现象
+- 非常漂亮的首页、业内独有的帮助文档、数据变动记录、水印等
+- 业内独有的用户表格自定义列，且保存到数据库
+- 业内最好的api、常量、等写法
+- 独有的本地、开发、测试、预发布、生产 5个env环境配置文件
+- 业内代码最清晰的layout布局写法
+- 业内可能只有我们把main.js中的router加载方式写对了
+- 以上只是一些举例，更多灿若繁星的惊喜和细节，等待着你的发现！[去查看](https://smartadmin.vip/views/v2/base/CodeFeature.html)
+
+
+### 后端特点
+
+- 高质量的 Java 代码、分包结构、和代码注释
 - 业内独创的请求返回码维护，非常值得一看
- 基于一个注解和controller的权限设计放弃更复杂的shiro，以及一套数据权限支持
- 四层架构（controller, service, manager, dao）
- 代码阅读性强、扩展性极高的员工、部门、角色、菜单管理
- 基于LRU策略的内存级权限缓存
- 配合前端vue-enum的swagger文档注解
- 心跳服务，让你发现有哪些机器再跑，哪些人在偷偷的跑你的Job
- 自定义的quartz job添加和修改，方便测试人员测试
- smart-reload，为系统预留钩子，动态加载，在不重启程序前提下执行一些代码，你懂的
- 以上只是一些举例，更多灿若繁星的惊喜和细节，等待着你的发现！
+- 四层架构（controller, service, manager, dao），为什么要有四层
+- vo, bo, form, entity ，各种 javabean 怎么区分和使用
+- 基于git diff的数据变更留痕功能，忘掉鸡肋的操作记录吧
+- 心跳服务，让你发现有哪些机器再跑，哪些人在偷偷的跑你的 Job
+- 支持接口加密解密注解、接口重复提交
+- maven多环境：开发、测试、预发布、生产 环境配置
+- smart-reload，为系统预留钩子，动态加载，在不重启程序前提下执行一些代码
+- 以上只是沧海一粟，更多的细节等待你的发现！[去查看](https://smartadmin.vip/views/v2/base/CodeFeature.html)

-#### 前端代码规范
- 文件、文件夹、目录结构、组建、变量等等怎么命名
- html、css、less等如何规范
- vue项目目录结构如何划分
- router和store该怎么划分扩展性更好
- vue组件规范该选择哪些
- 以及更多，数不胜数让你觉得实用，同时身心愉悦的规范
-
-#### 后端代码规范
- 四层架构（controller, service, manager, dao） 是什么，为什么要有四层
- 各个层的代码该怎么写才能让团队配合默契，高度一致
- vo, bo, dto, entity ，各种javabean 怎么区分和使用
- spring的 @Transactional 你用对了吗
- 方法参数个数、注释、todo这些也要有规范，你遵守过吗
- 以上举例，只是沧海一粟，更多的细节等待你的发现！
-
-ps：以上规范基础都是以团队出发，让团队开心快乐的写代码，而不是为了代码规范而规范，不喜勿喷！谢谢。
-
-#### 联系我们
-[1024创新实验室](https://www.1024lab.net/)
-
-官方QQ群：914442584
-
-SmartAdmin微信群（**加我拉你入群！**）：
+### 联系我们

 <table>
 <tr>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/zhuoda-wechat.jpg"/></td>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/smart-admin-qq-group.png"/></td>
-  <td><img src="http://cdn.1024lab.net/img/smart-admin/zhuoda-wechat-money-v1.jpg"/></td>
+  <td><img src="https://gitee.com/lab1024/smart-admin/raw/master/%E6%88%AA%E5%9B%BE/zhuoda-wechat.jpg"/></td>
+  <td><img src="https://gitee.com/lab1024/smart-admin/raw/master/%E6%88%AA%E5%9B%BE/xiaozhen-gzh.jpg"/></td>
+  <td><img src="https://gitee.com/lab1024/smart-admin/raw/master/%E6%88%AA%E5%9B%BE/zhuoda-wechat-money-v1.jpg"/></td>
+</tr>
+<tr>
+  <td style="text-align:center">骚扰“卓大”，拉你入群</td>
+  <td style="text-align:center">关注“小镇程序员”，代码与生活、技术与钱途</td>
+  <td style="text-align:center">请我们喝杯咖啡</td>
 </tr>
 </table>

---
-作者简介:
-[卓大](https://zhuoluodada.cn)， 1024创新实验室主任，混迹于各个技术圈，研究过计算机，熟悉点java，略懂点前端。
+### 作者
+
+[1024创新实验室-主任：卓大](https://zhuoda.vip)，混迹于各个技术圈，研究过计算机，熟悉点 java，略懂点前端。  
+[1024创新实验室（河南·洛阳）](https://1024lab.net) 致力于成为中原领先、国内一流的技术团队，以技术创新为驱动，合作各类项目（软件外包、技术顾问、培训等等）。
+
--- a/smart-admin-api/.gitignore
+++ b/smart-admin-api/.gitignore
@@ -0,0 +1,35 @@
+HELP.md
+target/
+
+velocity.log
+
+!.mvn/wrapper/maven-wrapper.jar
+
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+.DS_Store
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+
+### VS Code ###
+.vscode/
--- a/smart-admin-api/pom.xml
+++ b/smart-admin-api/pom.xml
@@ -0,0 +1,370 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>net.1024lab</groupId>
+    <artifactId>sa-parent</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+
+    <name>sa-parent</name>
+    <description>SmartAdmin project</description>
+
+	<modules>
+        <module>sa-common</module>
+		<module>sa-admin</module>
+    </modules>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <springboot.version>2.7.5</springboot.version>
+        <spring-mock.version>2.0.8</spring-mock.version>
+        <mybatis-plus.version>3.5.2</mybatis-plus.version>
+        <p6spy.version>3.8.6</p6spy.version>
+        <swagger.version>2.7.0</swagger.version>
+        <fastjson.version>2.0.16</fastjson.version>
+        <druid.version>1.2.14</druid.version>
+        <google-linkedhashmap.version>1.4.2</google-linkedhashmap.version>
+        <google-guava.version>20.0</google-guava.version>
+        <user-agent-utils.version>1.21</user-agent-utils.version>
+        <kaptcha.version>2.3.2</kaptcha.version>
+        <reflections.version>0.9.11</reflections.version>
+        <commons-io.version>2.6</commons-io.version>
+        <commons-lang3.version>3.12.0</commons-lang3.version>
+        <commons-collections4.version>4.4</commons-collections4.version>
+        <commons-codec.version>1.13</commons-codec.version>
+        <easypoi.version>4.2.0</easypoi.version>
+        <xerces.version>2.12.0</xerces.version>
+        <poi-scratchpad.version>4.1.1</poi-scratchpad.version>
+        <poi-ooxml-schemas.version>1.3</poi-ooxml-schemas.version>
+        <aws-java-sdk.version>1.11.842</aws-java-sdk.version>
+        <log4j-spring-boot.version>2.17.2</log4j-spring-boot.version>
+        <hutool.version>5.7.22</hutool.version>
+        <velocity-engine-core.version>2.3</velocity-engine-core.version>
+        <jjwt.version>0.9.1</jjwt.version>
+        <jwks-rsa.version>0.9.0</jwks-rsa.version>
+        <velocity-tools.version>3.1</velocity-tools.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+
+            <!--BOM begin-->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${springboot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <!--BOM end-->
+
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-mock</artifactId>
+                <version>${spring-mock.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>commons-logging</artifactId>
+                        <groupId>commons-logging</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>${mybatis-plus.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-starter-logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>p6spy</groupId>
+                <artifactId>p6spy</artifactId>
+                <version>${p6spy.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger2</artifactId>
+                <version>${swagger.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>guava</artifactId>
+                        <groupId>com.google.guava</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger-ui</artifactId>
+                <version>${swagger.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>druid</artifactId>
+                <version>${druid.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+                <artifactId>concurrentlinkedhashmap-lru</artifactId>
+                <version>${google-linkedhashmap.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${google-guava.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>eu.bitwalker</groupId>
+                <artifactId>UserAgentUtils</artifactId>
+                <version>${user-agent-utils.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.github.penggle</groupId>
+                <artifactId>kaptcha</artifactId>
+                <version>${kaptcha.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.reflections</groupId>
+                <artifactId>reflections</artifactId>
+                <version>${reflections.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>guava</artifactId>
+                        <groupId>com.google.guava</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons-io.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons-lang3.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-collections4</artifactId>
+                <version>${commons-collections4.version}</version>
+            </dependency>
+
+            <dependency>
+                <artifactId>commons-codec</artifactId>
+                <groupId>commons-codec</groupId>
+                <version>${commons-codec.version}</version>
+            </dependency>
+
+            <!-- poi start -->
+            <dependency>
+                <groupId>cn.afterturn</groupId>
+                <artifactId>easypoi-spring-boot-starter</artifactId>
+                <version>${easypoi.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>cn.afterturn</groupId>
+                <artifactId>easypoi-web</artifactId>
+                <version>${easypoi.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>javassist</artifactId>
+                        <groupId>org.javassist</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>guava</artifactId>
+                        <groupId>com.google.guava</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- sax 读取时候用到的 -->
+<!--            <dependency>-->
+<!--                <groupId>xerces</groupId>-->
+<!--                <artifactId>xercesImpl</artifactId>-->
+<!--                <version>${xerces.version}</version>-->
+<!--            </dependency>-->
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-scratchpad</artifactId>
+                <version>${poi-scratchpad.version}</version>
+            </dependency>
+
+            <!-- Word 需要使用 -->
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>ooxml-schemas</artifactId>
+                <version>${poi-ooxml-schemas.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.amazonaws</groupId>
+                <artifactId>aws-java-sdk-s3</artifactId>
+                <version>${aws-java-sdk.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>commons-logging</artifactId>
+                        <groupId>commons-logging</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-spring-boot</artifactId>
+                <version>${log4j-spring-boot.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-all</artifactId>
+                <version>${hutool.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt</artifactId>
+                <version>${jjwt.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.auth0</groupId>
+                <artifactId>jwks-rsa</artifactId>
+                <version>${jwks-rsa.version}</version>
+            </dependency>
+
+            <!--velocity begin-->
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity-engine-core</artifactId>
+                <version>${velocity-engine-core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.velocity.tools</groupId>
+                <artifactId>velocity-tools-generic</artifactId>
+                <version>${velocity-tools.version}</version>
+            </dependency>
+            <!--velocity end-->
+        </dependencies>
+
+    </dependencyManagement>
+
+    <build>
+        <finalName>${profiles.active}-${project.name}</finalName>
+        <resources>
+            <resource>
+                <filtering>false</filtering>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>dev/*</exclude>
+                    <exclude>test/*</exclude>
+                    <exclude>pre/*</exclude>
+                    <exclude>prod/*</exclude>
+                </excludes>
+            </resource>
+
+            <resource>
+                <directory>src/main/resources/${profiles.active}</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>*.yaml</include>
+                </includes>
+            </resource>
+
+            <resource>
+                <directory>src/main/resources/${profiles.active}</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>*.*</include>
+                </includes>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.2</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <testFailureIgnore>true</testFailureIgnore>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${springboot.version}</version>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <!--开发环境-->
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profiles.active>dev</profiles.active>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <!--测试环境-->
+        <profile>
+            <id>test</id>
+            <properties>
+                <profiles.active>test</profiles.active>
+            </properties>
+        </profile>
+        <!--预发布环境-->
+        <profile>
+            <id>pre</id>
+            <properties>
+                <profiles.active>pre</profiles.active>
+            </properties>
+        </profile>
+        <!--生产环境-->
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profiles.active>prod</profiles.active>
+            </properties>
+        </profile>
+    </profiles>
+
+</project>
--- a/smart-admin-api/sa-admin/pom.xml
+++ b/smart-admin-api/sa-admin/pom.xml
@@ -0,0 +1,47 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>net.1024lab</groupId>
+        <artifactId>sa-parent</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>sa-admin</artifactId>
+    <version>1.0.0</version>
+    <packaging>jar</packaging>
+
+    <name>sa-admin</name>
+    <description>sa-admin project</description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>net.1024lab</groupId>
+            <artifactId>sa-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>net.lab1024.sa.admin.SmartAdminApplication</mainClass>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/SmartAdminApplication.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/SmartAdminApplication.java
@@ -0,0 +1,33 @@
+package net.lab1024.sa.admin;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ * SmartAdmin 项目启动类
+ *
+ * @Author 1024创新实验室-主任:卓大
+ * @Date 2022-08-29 21:00:58
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@EnableCaching
+@EnableScheduling
+@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
+@ComponentScan(basePackages = {"net.lab1024.sa"})
+@MapperScan(value = "net.lab1024.sa", annotationClass = Mapper.class)
+@SpringBootApplication(exclude = {UserDetailsServiceAutoConfiguration.class })
+public class SmartAdminApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SmartAdminApplication.class, args);
+    }
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/common/AdminBaseController.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/common/AdminBaseController.java
@@ -0,0 +1,13 @@
+package net.lab1024.sa.admin.common;
+
+/**
+ * admin 相关的父类
+ *
+ * @Author 1024创新实验室-主任:卓大
+ * @Date 2022-06-10 21:00:58
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+public class AdminBaseController {
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/JweAspectConfig.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/JweAspectConfig.java
@@ -0,0 +1,38 @@
+package net.lab1024.sa.admin.config;
+
+import net.lab1024.sa.common.common.domain.RequestUser;
+import net.lab1024.sa.common.common.util.SmartRequestUtil;
+import net.lab1024.sa.common.module.support.jwe.JweAspect;
+import net.lab1024.sa.common.module.support.jwe.JweUserKey;
+import net.lab1024.sa.common.module.support.operatelog.core.OperateLogAspect;
+import net.lab1024.sa.common.module.support.operatelog.core.OperateLogConfig;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 操作日志切面 配置
+ *
+ * @Author 1024创新实验室: 罗伊
+ * @Date 2022-05-30 21:22:12
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ）
+ */
+@Configuration
+public class JweAspectConfig {
+
+    /**
+     * 配置信息
+     */
+    @Bean
+    public JweAspect jweConfig() {
+        return new JweAspect((request -> {
+            RequestUser requestUser = SmartRequestUtil.getRequestUser();
+            JweUserKey userKey = new JweUserKey();
+            userKey.setUserId(requestUser.getUserId());
+            userKey.setUserName(requestUser.getUserName());
+            userKey.setExtData(requestUser.getUserType().getValue().toString());
+            return userKey;
+        }));
+    }
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/OperateLogAspectConfig.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/OperateLogAspectConfig.java
@@ -0,0 +1,34 @@
+package net.lab1024.sa.admin.config;
+
+import net.lab1024.sa.common.common.domain.RequestUser;
+import net.lab1024.sa.common.common.util.SmartRequestUtil;
+import net.lab1024.sa.common.module.support.operatelog.core.OperateLogAspect;
+import net.lab1024.sa.common.module.support.operatelog.core.OperateLogConfig;
+import org.springframework.context.annotation.Configuration;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 操作日志切面 配置
+ *
+ * @Author 1024创新实验室: 罗伊
+ * @Date 2022-05-30 21:22:12
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ）
+ */
+@Configuration
+public class OperateLogAspectConfig extends OperateLogAspect{
+
+    /**
+     * 配置信息
+     * @return
+     */
+    @Override
+    public OperateLogConfig getOperateLogConfig() {
+        OperateLogConfig config = OperateLogConfig.builder().corePoolSize(4).queueCapacity(1000).build();
+        return config;
+    }
+
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SecurityConfig.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SecurityConfig.java
@@ -0,0 +1,40 @@
+package net.lab1024.sa.admin.config;
+
+import net.lab1024.sa.admin.module.system.login.service.LoginService;
+import net.lab1024.sa.common.common.security.AbstractSecurityConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.function.BiFunction;
+
+/**
+ * 权限配置
+ *
+ * @Author 1024创新实验室: 罗伊
+ * @Date 2022-05-30 21:22:12
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ）
+ */
+@Configuration
+public class SecurityConfig extends AbstractSecurityConfig {
+    /**
+     * 获取TOKEN 解析类
+     */
+    @Autowired
+    private LoginService loginService;
+
+    @Override
+    protected BiFunction<String, HttpServletRequest, UserDetails> userFunction() {
+        return (token, request) -> loginService.getLoginUserDetail(token, request);
+    }
+
+    @Override
+    protected String[] getAuthenticatedUrlPatterns() {
+        return new String[]{"/**"};
+    }
+
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SecurityMethodConfig.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/SecurityMethodConfig.java
@@ -0,0 +1,50 @@
+package net.lab1024.sa.admin.config;
+
+import net.lab1024.sa.admin.module.system.login.domain.LoginEmployeeDetail;
+import net.lab1024.sa.common.common.annoation.SaAuth;
+import net.lab1024.sa.common.common.security.SecurityMethodSource;
+import net.lab1024.sa.common.common.security.SecurityPermissionCheckService;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.access.expression.method.ExpressionBasedAnnotationAttributeFactory;
+import org.springframework.security.access.method.MethodSecurityMetadataSource;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration;
+import org.springframework.security.core.Authentication;
+
+/**
+ * 1、以类名加方法名为权限字符串的校验模式 <br>
+ * 2、重写MethodSecurityMetadataSource将优化security配置，只需在方法上加上@saAuth注解，方法上就会存在权限（权限字符串为类名加方法名），而无需另外手动设置，减轻后端开发成本<br>
+ * 3、security将不再依据权限字符串进行权限控制，<br>
+ * 4、security将依据对应权限字符串下的接口权限进行控制 <br>
+ * 5、采用此配置原@PreAuthorize依然有效 <br>
+ * 6、如若无需此配置，需将@EnableGlobalMethodSecurity注解添加至SecurityConfig类上
+ *
+ * @Author 1024创新实验室: 罗伊
+ * @Date 2021-08-31 0:01
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ）
+ */
+@EnableGlobalMethodSecurity(prePostEnabled = true)
+public class SecurityMethodConfig extends GlobalMethodSecurityConfiguration {
+
+    @Bean(SaAuth.saAuth)
+    public SecurityPermissionCheckService securityPermissionCheckService() {
+        return new SecurityPermissionCheckService() {
+            @Override
+            public boolean checkPermission(Authentication authentication, String permission) {
+                LoginEmployeeDetail loginEmployeeDetail = (LoginEmployeeDetail) authentication.getPrincipal();
+                if (loginEmployeeDetail.getAdministratorFlag()) {
+                    return true;
+                }
+                return super.permissionJudge(loginEmployeeDetail, permission);
+            }
+        };
+    }
+
+    @Override
+    public MethodSecurityMetadataSource customMethodSecurityMetadataSource() {
+        ExpressionBasedAnnotationAttributeFactory attributeFactory = new ExpressionBasedAnnotationAttributeFactory(this.getExpressionHandler());
+        return new SecurityMethodSource(attributeFactory, SaAuth.saAuth);
+    }
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminCacheConst.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminCacheConst.java
@@ -0,0 +1,57 @@
+package net.lab1024.sa.admin.constant;
+
+import net.lab1024.sa.common.constant.CacheKeyConst;
+
+/**
+ * 缓存 key
+ *
+ * @Author 1024创新实验室-主任:卓大
+ * @Date 2022-01-07 18:59:22
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+public class AdminCacheConst extends CacheKeyConst {
+
+    public static class Department {
+
+        /**
+         * 部门列表
+         */
+        public static final String DEPARTMENT_LIST_CACHE = "department_list_cache";
+
+        /**
+         * 部门map
+         */
+        public static final String DEPARTMENT_MAP_CACHE = "department_map_cache";
+
+        /**
+         * 部门树
+         */
+        public static final String DEPARTMENT_TREE_CACHE = "department_tree_cache";
+
+        /**
+         * 某个部门以及下级的id列表
+         */
+        public static final String DEPARTMENT_SELF_CHILDREN_CACHE = "department_self_children_cache";
+
+        /**
+         * 部门路径 缓存
+         */
+        public static final String DEPARTMENT_PATH_CACHE = "department_path_cache";
+
+    }
+
+    /**
+     * 分类相关缓存
+     */
+    public static class CATEGORY {
+
+        public static final String CATEGORY_ENTITY = "category_cache";
+
+        public static final String CATEGORY_SUB = "category_sub_cache";
+
+        public static final String CATEGORY_TREE = "category_tree_cache";
+    }
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminRedisKeyConst.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminRedisKeyConst.java
@@ -0,0 +1,17 @@
+package net.lab1024.sa.admin.constant;
+
+import net.lab1024.sa.common.constant.RedisKeyConst;
+
+/**
+ * redis key 常量类
+ *
+ * @Author 1024创新实验室-主任:卓大
+ * @Date 2022-01-07 18:59:22
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+public class AdminRedisKeyConst extends RedisKeyConst {
+
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminSwaggerTagConst.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminSwaggerTagConst.java
@@ -0,0 +1,55 @@
+package net.lab1024.sa.admin.constant;
+
+import net.lab1024.sa.common.constant.SwaggerTagConst;
+
+/**
+ * swagger
+ *
+ * @Author 1024创新实验室:罗伊
+ * @Date 2022-01-07 18:59:22
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+public class AdminSwaggerTagConst extends SwaggerTagConst {
+
+    public static class Business {
+        public static final String MANAGER_CATEGORY = "ERP进销存-分类管理";
+
+        public static final String MANAGER_GOODS = "ERP进销存-商品管理";
+
+        public static final String OA_BANK = "OA办公-银行卡信息";
+
+        public static final String OA_ENTERPRISE = "OA办公-企业";
+
+        public static final String OA_INVOICE = "OA办公-发票信息";
+
+        public static final String OA_NOTICE = "OA办公-通知公告";
+    }
+
+
+    public static class System {
+
+        public static final String SYSTEM_LOGIN = "系统-员工登录";
+
+        public static final String SYSTEM_EMPLOYEE = "系统-员工管理";
+
+        public static final String SYSTEM_DEPARTMENT = "系统-部门管理";
+
+        public static final String SYSTEM_MENU = "系统-菜单";
+
+        public static final String SYSTEM_DATA_SCOPE = "系统-系统-数据范围";
+
+        public static final String SYSTEM_ROLE = "系统-角色";
+
+        public static final String SYSTEM_ROLE_DATA_SCOPE = "系统-角色-数据范围";
+
+        public static final String SYSTEM_ROLE_EMPLOYEE = "系统-角色-员工";
+
+        public static final String SYSTEM_ROLE_MENU = "系统-角色-菜单";
+
+        public static final String SYSTEM_DATA_TRACER = "系统-";
+    }
+
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/listener/AdminStartupRunner.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/listener/AdminStartupRunner.java
@@ -0,0 +1,40 @@
+package net.lab1024.sa.admin.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import net.lab1024.sa.common.common.code.ErrorCodeRegister;
+import net.lab1024.sa.common.config.ScheduleConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+/**
+ * admin 应用启动加载
+ *
+ * @Author 1024创新实验室-主任:卓大
+ * @Date 2021-08-26 18:46:32
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Slf4j
+@Component
+public class AdminStartupRunner implements CommandLineRunner {
+
+    @Autowired
+    private ScheduleConfig scheduleConfig;
+
+    @Override
+    public void run(String... args) {
+
+        // 初始化状态码
+        int codeCount = ErrorCodeRegister.initialize();
+
+        //TODO <卓大> ：根据实际情况来决定是否开启定时任务
+        String destroySchedules = "Spring 定时任务 @Schedule 已启动";
+//        destroySchedules = scheduleConfig.destroy();
+
+        log.info("\n ---------------【1024创新实验室 温馨提示：】 ErrorCode 共计完成初始化： {}个！---------------" +
+                 "\n ---------------【1024创新实验室 温馨提示：】 {}---------------\n", codeCount, destroySchedules);
+
+    }
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/constant/CategoryTypeEnum.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/constant/CategoryTypeEnum.java
@@ -0,0 +1,36 @@
+package net.lab1024.sa.admin.module.business.category.constant;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import net.lab1024.sa.common.common.enumeration.BaseEnum;
+
+/**
+ * 分类类型 枚举
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021/08/05 21:26:58
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@AllArgsConstructor
+@Getter
+public enum CategoryTypeEnum implements BaseEnum {
+
+    /**
+     * 1 商品
+     */
+    GOODS(1, "商品"),
+
+    /**
+     * 2 自定义
+     */
+    CUSTOM(2, "自定义"),
+
+    ;
+
+    private final Integer value;
+
+    private final String desc;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/controller/CategoryController.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/controller/CategoryController.java
@@ -0,0 +1,67 @@
+package net.lab1024.sa.admin.module.business.category.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import net.lab1024.sa.admin.common.AdminBaseController;
+import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
+import net.lab1024.sa.admin.module.business.category.domain.form.CategoryAddForm;
+import net.lab1024.sa.admin.module.business.category.domain.form.CategoryTreeQueryForm;
+import net.lab1024.sa.admin.module.business.category.domain.form.CategoryUpdateForm;
+import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryTreeVO;
+import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryVO;
+import net.lab1024.sa.admin.module.business.category.service.CategoryService;
+import net.lab1024.sa.common.common.domain.ResponseDTO;
+import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 类目
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021/08/05 21:26:58
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@OperateLog
+@RestController
+@Api(tags = AdminSwaggerTagConst.Business.MANAGER_CATEGORY)
+public class CategoryController extends AdminBaseController {
+
+    @Autowired
+    private CategoryService categoryService;
+
+    @ApiOperation("添加类目 @author 胡克")
+    @PostMapping("/category/add")
+    public ResponseDTO<String> add(@RequestBody @Valid CategoryAddForm addForm) {
+        return categoryService.add(addForm);
+    }
+
+    @ApiOperation("更新类目 @author 胡克")
+    @PostMapping("/category/update")
+    public ResponseDTO<String> update(@RequestBody @Valid CategoryUpdateForm updateForm) {
+        return categoryService.update(updateForm);
+    }
+
+    @ApiOperation("查询类目详情 @author 胡克")
+    @GetMapping("/category/{categoryId}")
+    public ResponseDTO<CategoryVO> queryDetail(@PathVariable Long categoryId) {
+        return categoryService.queryDetail(categoryId);
+    }
+
+    @ApiOperation("查询类目层级树 @author 胡克")
+    @PostMapping("/category/tree")
+    public ResponseDTO<List<CategoryTreeVO>> queryTree(@RequestBody @Valid CategoryTreeQueryForm queryForm) {
+        return categoryService.queryTree(queryForm);
+    }
+
+    @ApiOperation("删除类目 @author 胡克")
+    @GetMapping("/category/delete/{categoryId}")
+    public ResponseDTO<String> delete(@PathVariable Long categoryId) {
+        return categoryService.delete(categoryId);
+    }
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/dao/CategoryDao.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/dao/CategoryDao.java
@@ -0,0 +1,72 @@
+package net.lab1024.sa.admin.module.business.category.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
+import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 类目 dao
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021/08/05 21:26:58
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Component
+@Mapper
+public interface CategoryDao extends BaseMapper<CategoryEntity> {
+
+    /**
+     * 根据父级id 类型 查询子类
+     *
+     * @param parentIdList
+     * @param deletedFlag
+     * @return
+     */
+    List<CategoryEntity> queryByParentId(@Param("parentIdList") List<Long> parentIdList,
+                                         @Param("deletedFlag") Boolean deletedFlag);
+
+    /**
+     * 根据父级id 类型 查询子类
+     *
+     * @param parentIdList
+     * @param categoryType {@link CategoryTypeEnum}
+     * @param deletedFlag
+     * @return
+     */
+    List<CategoryEntity> queryByParentIdAndType(@Param("parentIdList") List<Long> parentIdList,
+                                         @Param("categoryType") Integer categoryType,
+                                         @Param("deletedFlag") Boolean deletedFlag);
+
+    /**
+     * 某个类型的所有
+     * @param categoryType
+     * @param deletedFlag
+     * @return
+     */
+    List<CategoryEntity> queryByType(@Param("categoryType") Integer categoryType,
+                                                @Param("deletedFlag") Boolean deletedFlag);
+
+    /**
+     * 根据类型和id查询
+     * @param categoryType
+     * @param categoryId
+     * @return
+     */
+    CategoryEntity selectByTypeAndId(@Param("categoryType") Integer categoryType, @Param("categoryId") Long categoryId);
+
+    /**
+     * 查看类目 具体条件 看sql
+     *
+     * @param entity
+     * @return
+     */
+    CategoryEntity selectOne(CategoryEntity entity);
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategoryBaseDTO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategoryBaseDTO.java
@@ -0,0 +1,44 @@
+package net.lab1024.sa.admin.module.business.category.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
+import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
+import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 类目 基础属性 DTO 类
+ *
+ * @author 胡克
+ * @date 2021/1/20 16:17
+ */
+@Data
+public class CategoryBaseDTO {
+
+    @ApiModelProperty(value = "类目名称", required = true)
+    @NotBlank(message = "类目名称不能为空")
+    @Length(max = 20, message = "类目名称最多20字符")
+    private String categoryName;
+
+    @ApiModelPropertyEnum(desc = "分类类型", value = CategoryTypeEnum.class)
+    @CheckEnum(value = CategoryTypeEnum.class, required = true, message = "分类错误")
+    private Integer categoryType;
+
+    @ApiModelProperty("父级类目id|可选")
+    private Long parentId;
+
+    @ApiModelProperty("排序|可选")
+    private Integer sort;
+
+    @ApiModelProperty("备注|可选")
+    @Length(max = 200, message = "备注最多200字符")
+    private String remark;
+
+    @ApiModelProperty("禁用状态")
+    @NotNull(message = "禁用状态不能为空")
+    private Boolean disabledFlag;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategorySimpleDTO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategorySimpleDTO.java
@@ -0,0 +1,26 @@
+package net.lab1024.sa.admin.module.business.category.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 类目 基础属性 DTO 类
+ *
+ * @author 胡克
+ * @date 2021/1/20 16:17
+ */
+@Data
+public class CategorySimpleDTO {
+
+    @ApiModelProperty("类目id")
+    private Long categoryId;
+
+    @ApiModelProperty("类目名称")
+    private String categoryName;
+
+    @ApiModelProperty("类目层级全称")
+    private String categoryFullName;
+
+    @ApiModelProperty("父级id")
+    private Long parentId;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/entity/CategoryEntity.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/entity/CategoryEntity.java
@@ -0,0 +1,67 @@
+package net.lab1024.sa.admin.module.business.category.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
+
+import java.time.LocalDateTime;
+
+/**
+ * 类目 实体类
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021/08/05 21:26:58
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+@TableName("t_category")
+public class CategoryEntity {
+
+    @TableId(type = IdType.AUTO)
+    private Long categoryId;
+
+    /**
+     * 类目名称
+     */
+    private String categoryName;
+
+    /**
+     * 类目 类型
+     *
+     * @see CategoryTypeEnum
+     */
+    private Integer categoryType;
+
+    /**
+     * 父级类目id
+     */
+    private Long parentId;
+
+    /**
+     * 是否禁用
+     */
+    private Boolean disabledFlag;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 删除状态
+     */
+    private Boolean deletedFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private LocalDateTime updateTime;
+
+    private LocalDateTime createTime;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryAddForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryAddForm.java
@@ -0,0 +1,49 @@
+package net.lab1024.sa.admin.module.business.category.domain.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
+import net.lab1024.sa.admin.module.business.category.domain.dto.CategoryBaseDTO;
+import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
+import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 类目 添加
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021/08/05 21:26:58
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class CategoryAddForm {
+
+    @ApiModelProperty(value = "类目名称", required = true)
+    @NotBlank(message = "类目名称不能为空")
+    @Length(max = 20, message = "类目名称最多20字符")
+    private String categoryName;
+
+    @ApiModelPropertyEnum(desc = "分类类型", value = CategoryTypeEnum.class)
+    @CheckEnum(value = CategoryTypeEnum.class, required = true, message = "分类错误")
+    private Integer categoryType;
+
+    @ApiModelProperty("父级类目id|可选")
+    private Long parentId;
+
+    @ApiModelProperty("排序|可选")
+    private Integer sort;
+
+    @ApiModelProperty("备注|可选")
+    @Length(max = 200, message = "备注最多200字符")
+    private String remark;
+
+    @ApiModelProperty("禁用状态")
+    @NotNull(message = "禁用状态不能为空")
+    private Boolean disabledFlag;
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryTreeQueryForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryTreeQueryForm.java
@@ -0,0 +1,25 @@
+package net.lab1024.sa.admin.module.business.category.domain.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
+import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
+
+/**
+ * 类目 层级树查询
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021/08/05 21:26:58
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class CategoryTreeQueryForm {
+
+    @ApiModelPropertyEnum(desc = "分类类型|可选", value = CategoryTypeEnum.class)
+    private Integer categoryType;
+
+    @ApiModelProperty("父级类目id|可选")
+    private Long parentId;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryUpdateForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryUpdateForm.java
@@ -0,0 +1,24 @@
+package net.lab1024.sa.admin.module.business.category.domain.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.admin.module.business.category.domain.dto.CategoryBaseDTO;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 类目 更新
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021/08/05 21:26:58
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class CategoryUpdateForm extends CategoryAddForm {
+
+    @ApiModelProperty("类目id")
+    @NotNull(message = "类目id不能为空")
+    private Long categoryId;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/vo/CategoryTreeVO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/vo/CategoryTreeVO.java
@@ -0,0 +1,40 @@
+package net.lab1024.sa.admin.module.business.category.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 类目 层级树 vo
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021/08/05 21:26:58
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class CategoryTreeVO {
+
+    @ApiModelProperty("类目id")
+    private Long categoryId;
+
+    @ApiModelProperty("类目名称")
+    private String categoryName;
+
+    @ApiModelProperty("类目层级全称")
+    private String categoryFullName;
+
+    @ApiModelProperty("父级id")
+    private Long parentId;
+
+    @ApiModelProperty("类目id")
+    private Long value;
+
+    @ApiModelProperty("类目名称")
+    private String label;
+
+    @ApiModelProperty("子类")
+    private List<CategoryTreeVO> children;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/vo/CategoryVO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/vo/CategoryVO.java
@@ -0,0 +1,51 @@
+package net.lab1024.sa.admin.module.business.category.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
+import net.lab1024.sa.admin.module.business.category.domain.dto.CategoryBaseDTO;
+import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
+import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+/**
+ * 类目
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021/08/05 21:26:58
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class CategoryVO {
+
+    @ApiModelProperty(value = "类目名称", required = true)
+    private String categoryName;
+
+    @ApiModelPropertyEnum(desc = "分类类型", value = CategoryTypeEnum.class)
+    private Integer categoryType;
+
+    @ApiModelProperty("父级类目id|可选")
+    private Long parentId;
+
+    @ApiModelProperty("排序|可选")
+    private Integer sort;
+
+    @ApiModelProperty("备注|可选")
+    private String remark;
+
+    @ApiModelProperty("禁用状态")
+    private Boolean disabledFlag;
+
+    @ApiModelProperty("类目id")
+    private Long categoryId;
+
+    private LocalDateTime updateTime;
+
+    private LocalDateTime createTime;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/manager/CategoryCacheManager.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/manager/CategoryCacheManager.java
@@ -0,0 +1,120 @@
+package net.lab1024.sa.admin.module.business.category.manager;
+
+import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
+import net.lab1024.sa.admin.constant.AdminCacheConst;
+import net.lab1024.sa.admin.module.business.category.dao.CategoryDao;
+import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
+import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryTreeVO;
+import net.lab1024.sa.common.common.constant.StringConst;
+import net.lab1024.sa.common.common.util.SmartBeanUtil;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 类目 查询 缓存
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021/08/05 21:26:58
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Service
+@Slf4j
+public class CategoryCacheManager {
+
+
+    @Autowired
+    private CategoryDao categoryDao;
+
+
+    /**
+     * 根据类目id 移除缓存
+     */
+    @CacheEvict(value = {AdminCacheConst.CATEGORY.CATEGORY_ENTITY, AdminCacheConst.CATEGORY.CATEGORY_SUB, AdminCacheConst.CATEGORY.CATEGORY_TREE}, allEntries = true)
+    public void removeCache() {
+        log.info("clear CATEGORY ,CATEGORY_SUB ,CATEGORY_TREE");
+    }
+
+    /**
+     * 查詢类目
+     *
+     * @param categoryId
+     * @return
+     */
+    @Cacheable(AdminCacheConst.CATEGORY.CATEGORY_ENTITY)
+    public CategoryEntity queryCategory(Long categoryId) {
+        return categoryDao.selectById(categoryId);
+    }
+
+    /**
+     * 查询类目 子级
+     *
+     * @param categoryId
+     * @return
+     */
+    @Cacheable(AdminCacheConst.CATEGORY.CATEGORY_SUB)
+    public List<CategoryEntity> querySubCategory(Long categoryId) {
+        return categoryDao.queryByParentId(Lists.newArrayList(categoryId), false);
+    }
+
+
+    /**
+     * 查询类目 层级树
+     * 优先查询缓存
+     *
+     * @return
+     */
+    @Cacheable(AdminCacheConst.CATEGORY.CATEGORY_TREE)
+    public List<CategoryTreeVO> queryCategoryTree(Long parentId, Integer categoryType) {
+        List<CategoryEntity> allCategoryEntityList = categoryDao.queryByType(categoryType, false);
+
+        List<CategoryEntity> categoryEntityList = allCategoryEntityList.stream().filter(e -> e.getParentId().equals(parentId)).collect(Collectors.toList());
+        List<CategoryTreeVO> treeList = SmartBeanUtil.copyList(categoryEntityList, CategoryTreeVO.class);
+        treeList.forEach(e -> {
+            e.setLabel(e.getCategoryName());
+            e.setValue(e.getCategoryId());
+            e.setCategoryFullName(e.getCategoryName());
+        });
+        // 递归设置子类
+        this.queryAndSetSubCategory(treeList, allCategoryEntityList);
+        return treeList;
+    }
+
+    /**
+     * 递归查询设置类目子类
+     * 从缓存查询子类
+     *
+     * @param treeList
+     */
+    private void queryAndSetSubCategory(List<CategoryTreeVO> treeList, List<CategoryEntity> allCategoryEntityList) {
+        if (CollectionUtils.isEmpty(treeList)) {
+            return;
+        }
+        List<Long> parentIdList = treeList.stream().map(CategoryTreeVO::getValue).collect(Collectors.toList());
+        List<CategoryEntity> categoryEntityList = allCategoryEntityList.stream().filter(e -> parentIdList.contains(e.getParentId())).collect(Collectors.toList());
+        Map<Long, List<CategoryEntity>> categorySubMap = categoryEntityList.stream().collect(Collectors.groupingBy(CategoryEntity::getParentId));
+        treeList.forEach(e -> {
+            List<CategoryEntity> childrenEntityList = categorySubMap.getOrDefault(e.getValue(), Lists.newArrayList());
+            List<CategoryTreeVO> childrenVOList = SmartBeanUtil.copyList(childrenEntityList, CategoryTreeVO.class);
+            childrenVOList.forEach(item -> {
+                item.setLabel(item.getCategoryName());
+                item.setValue(item.getCategoryId());
+                item.setCategoryFullName(e.getCategoryFullName() + StringConst.SEPARATOR_SLASH + item.getCategoryName());
+            });
+            // 递归查询
+            this.queryAndSetSubCategory(childrenVOList, allCategoryEntityList);
+            e.setChildren(childrenVOList);
+        });
+    }
+
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryQueryService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryQueryService.java
@@ -0,0 +1,214 @@
+package net.lab1024.sa.admin.module.business.category.service;
+
+import cn.hutool.core.util.StrUtil;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import net.lab1024.sa.admin.module.business.category.dao.CategoryDao;
+import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
+import net.lab1024.sa.admin.module.business.category.domain.dto.CategorySimpleDTO;
+import net.lab1024.sa.admin.module.business.category.manager.CategoryCacheManager;
+import net.lab1024.sa.common.common.constant.StringConst;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 类目 查询 业务类
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021/08/05 21:26:58
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Service
+@Slf4j
+public class CategoryQueryService {
+
+    private static final Long DEFAULT_CATEGORY_PARENT_ID = 0L;
+
+    @Autowired
+    private CategoryDao categoryDao;
+
+    @Autowired
+    private CategoryCacheManager categoryCacheManager;
+
+    /**
+     * 根据 id 查询未删除的类目
+     *
+     * @param categoryId
+     * @return 可能 null
+     */
+    public Optional<CategoryEntity> queryCategory(Long categoryId) {
+        if (null == categoryId) {
+            return Optional.empty();
+        }
+        CategoryEntity entity = categoryCacheManager.queryCategory(categoryId);
+        if (null == entity || entity.getDeletedFlag()) {
+            return Optional.empty();
+        }
+        return Optional.of(entity);
+    }
+
+
+    /**
+     * 根据 类目id集合 查询未删除的类目集合
+     *
+     * @param categoryIdList
+     * @return
+     */
+    public Map<Long, CategoryEntity> queryCategoryList(List<Long> categoryIdList) {
+        if (CollectionUtils.isEmpty(categoryIdList)) {
+            return Collections.emptyMap();
+        }
+        categoryIdList = categoryIdList.stream().distinct().collect(Collectors.toList());
+        Map<Long, CategoryEntity> categoryEntityMap = Maps.newHashMap();
+        for (Long categoryId : categoryIdList) {
+            CategoryEntity categoryEntity = categoryCacheManager.queryCategory(categoryId);
+            if(categoryEntity != null){
+                categoryEntityMap.put(categoryId, categoryEntity);
+            }
+        }
+        return categoryEntityMap;
+    }
+
+
+    /**
+     * 根据类目id 递归查询该id的所有子类id 递归查询
+     * 同时存入缓存
+     * 注意：查询出来的集合 不包含传递的父类参数
+     *
+     * @param categoryIdList
+     */
+    public List<Long> queryCategorySubId(List<Long> categoryIdList) {
+        if (CollectionUtils.isEmpty(categoryIdList)) {
+            return Collections.emptyList();
+        }
+        //所有子类
+        List<CategoryEntity> categoryEntityList = Lists.newArrayList();
+        categoryIdList.forEach(e -> {
+            categoryEntityList.addAll(categoryCacheManager.querySubCategory(e));
+        });
+        Map<Long, List<CategoryEntity>> subTypeMap = categoryEntityList.stream().collect(Collectors.groupingBy(CategoryEntity::getCategoryId));
+        // 递归查询子类
+        categoryIdList = subTypeMap.values().stream().flatMap(Collection::stream).map(CategoryEntity::getCategoryId).distinct().collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(categoryIdList)) {
+            return Lists.newArrayList();
+        }
+        categoryIdList.addAll(this.queryCategorySubId(categoryIdList));
+        return categoryIdList;
+    }
+
+
+    /**
+     * 处理类目名称
+     *
+     * @param categoryIdList
+     */
+    public List<String> queryCategoryName(List<Long> categoryIdList) {
+        if (CollectionUtils.isEmpty(categoryIdList)) {
+            return null;
+        }
+        Map<Long, CategoryEntity> categoryMap = this.queryCategoryList(categoryIdList);
+        List<String> categoryNameList = Lists.newArrayList();
+        categoryIdList.forEach(e -> {
+            CategoryEntity categoryEntity = categoryMap.get(e);
+            if (categoryEntity != null) {
+                categoryNameList.add(categoryMap.get(e).getCategoryName());
+            }
+        });
+        return categoryNameList;
+    }
+
+    /**
+     * 根据类目id 查询类目名称
+     *
+     * @param categoryId
+     * @return
+     */
+    public String queryCategoryName(Long categoryId) {
+        CategoryEntity categoryEntity = categoryCacheManager.queryCategory(categoryId);
+        if (null == categoryEntity || categoryEntity.getDeletedFlag()) {
+            return null;
+        }
+        return categoryEntity.getCategoryName();
+    }
+
+    /**
+     * 根据类目id 查询类目详情 包含类目全称 如：医考/医师资格/临床执业
+     *
+     * @param categoryId
+     * @return
+     */
+    public CategorySimpleDTO queryCategoryInfo(Long categoryId) {
+        CategoryEntity categoryEntity = categoryCacheManager.queryCategory(categoryId);
+        if (null == categoryEntity || categoryEntity.getDeletedFlag()) {
+            return null;
+        }
+        String fullName = this.queryFullName(categoryId);
+        // 返回DTO
+        CategorySimpleDTO categoryDTO = new CategorySimpleDTO();
+        categoryDTO.setCategoryId(categoryId);
+        categoryDTO.setCategoryName(categoryEntity.getCategoryName());
+        categoryDTO.setCategoryFullName(fullName);
+        categoryDTO.setParentId(categoryEntity.getParentId());
+        return categoryDTO;
+    }
+
+    /**
+     * 递归查询分类和所有父级类目
+     * ps:特别注意返回的集合中 包含自己
+     *
+     * @param categoryId
+     * @return
+     */
+    public List<CategoryEntity> queryCategoryAndParent(Long categoryId) {
+        List<CategoryEntity> parentCategoryList = Lists.newArrayList();
+        CategoryEntity categoryEntity = categoryCacheManager.queryCategory(categoryId);
+        if (null == categoryEntity || categoryEntity.getDeletedFlag()) {
+            return parentCategoryList;
+        }
+
+        // 父级始终放在第一位
+        parentCategoryList.add(0, categoryEntity);
+        Long parentId = categoryEntity.getParentId();
+        if (Objects.equals(DEFAULT_CATEGORY_PARENT_ID, parentId)) {
+            return parentCategoryList;
+        }
+        parentCategoryList.addAll(0, this.queryCategoryAndParent(parentId));
+        return parentCategoryList;
+    }
+
+    /**
+     * 查询 分类全称 如：医考/医师资格/临床执业
+     *
+     * @param categoryId
+     * @return
+     */
+    public String queryFullName(Long categoryId) {
+        List<CategoryEntity> parentCategoryList = this.queryCategoryAndParent(categoryId);
+        // 拼接父级类目名称 斜杠分隔返回
+        List<String> nameList = parentCategoryList.stream().map(CategoryEntity::getCategoryName).collect(Collectors.toList());
+        return StrUtil.join(StringConst.SEPARATOR_SLASH, nameList);
+    }
+
+    /**
+     * 查询 分类全称 如：医考/医师资格/临床执业
+     *
+     * @param categoryIdList
+     * @return
+     */
+    public Map<Long, String> queryFullName(List<Long> categoryIdList) {
+        if (CollectionUtils.isEmpty(categoryIdList)) {
+            return Collections.EMPTY_MAP;
+        }
+        // 循环内查询的缓存 还ok
+        return categoryIdList.stream().collect(Collectors.toMap(Function.identity(), this::queryFullName));
+    }
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java
@@ -0,0 +1,220 @@
+package net.lab1024.sa.admin.module.business.category.service;
+
+import com.google.common.collect.Lists;
+import net.lab1024.sa.admin.module.business.category.dao.CategoryDao;
+import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
+import net.lab1024.sa.admin.module.business.category.domain.form.CategoryAddForm;
+import net.lab1024.sa.admin.module.business.category.domain.form.CategoryTreeQueryForm;
+import net.lab1024.sa.admin.module.business.category.domain.form.CategoryUpdateForm;
+import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryTreeVO;
+import net.lab1024.sa.admin.module.business.category.domain.vo.CategoryVO;
+import net.lab1024.sa.admin.module.business.category.manager.CategoryCacheManager;
+import net.lab1024.sa.common.common.code.UserErrorCode;
+import net.lab1024.sa.common.common.domain.ResponseDTO;
+import net.lab1024.sa.common.common.util.SmartBeanUtil;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * 类目
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021/08/05 21:26:58
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Service
+public class CategoryService {
+
+    @Autowired
+    private CategoryDao categoryDao;
+
+    @Autowired
+    private CategoryQueryService categoryQueryService;
+
+    @Autowired
+    private CategoryCacheManager categoryCacheManager;
+
+    /**
+     * 添加类目
+     *
+     * @author 胡克
+     * @date 2021/1/20 17:17
+     */
+    public ResponseDTO<String> add(CategoryAddForm addForm) {
+        // 校验类目
+        CategoryEntity categoryEntity = SmartBeanUtil.copy(addForm, CategoryEntity.class);
+        ResponseDTO<String> res = this.checkCategory(categoryEntity, false);
+        if (!res.getOk()) {
+            return res;
+        }
+        // 没有父类则使用默认父类
+        Long parentId = null == addForm.getParentId() ? NumberUtils.LONG_ZERO : addForm.getParentId();
+        categoryEntity.setParentId(parentId);
+        categoryEntity.setSort(null == addForm.getSort() ? 0 : addForm.getSort());
+        categoryEntity.setDeletedFlag(false);
+
+        // 保存数据
+        categoryDao.insert(categoryEntity);
+
+        // 更新缓存
+        categoryCacheManager.removeCache();
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 更新类目
+     * 不能更新父级类目
+     *
+     * @author 胡克
+     * @date 2021/1/20 17:17
+     */
+    public ResponseDTO<String> update(CategoryUpdateForm updateForm) {
+        // 校验类目
+        Long categoryId = updateForm.getCategoryId();
+        Optional<CategoryEntity> optional = categoryQueryService.queryCategory(categoryId);
+        if (!optional.isPresent()) {
+            return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
+        }
+        CategoryEntity categoryEntity = SmartBeanUtil.copy(updateForm, CategoryEntity.class);
+
+        /**
+         * 不更新类目类型
+         * 不更新父类id
+         */
+        Integer categoryType = optional.get().getCategoryType();
+        categoryEntity.setCategoryType(categoryType);
+        categoryEntity.setParentId(optional.get().getParentId());
+
+        ResponseDTO<String> responseDTO = this.checkCategory(categoryEntity, true);
+        if (!responseDTO.getOk()) {
+            return responseDTO;
+        }
+        categoryDao.updateById(categoryEntity);
+
+        // 更新缓存
+        categoryCacheManager.removeCache();
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 新增/更新 类目时的 校验
+     *
+     * @param categoryEntity
+     * @param isUpdate
+     * @return
+     */
+    private ResponseDTO<String> checkCategory(CategoryEntity categoryEntity, boolean isUpdate) {
+        // 校验父级是否存在
+        Long parentId = categoryEntity.getParentId();
+        Integer categoryType = categoryEntity.getCategoryType();
+        if (null != parentId) {
+            if (Objects.equals(categoryEntity.getCategoryId(), parentId)) {
+                return ResponseDTO.userErrorParam("父级类目怎么和自己相同了");
+            }
+            if (!Objects.equals(parentId, NumberUtils.LONG_ZERO)) {
+                Optional<CategoryEntity> optional = categoryQueryService.queryCategory(parentId);
+                if (!optional.isPresent()) {
+                    return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST, "父级类目不存在~");
+                }
+
+                CategoryEntity parent = optional.get();
+                if (!Objects.equals(categoryType, parent.getCategoryType())) {
+                    return ResponseDTO.userErrorParam("与父级类目类型不一致");
+                }
+            }
+
+        } else {
+            // 如果没有父类 使用默认父类
+            parentId = NumberUtils.LONG_ZERO;
+        }
+
+        // 校验同父类下 名称是否重复
+        CategoryEntity queryEntity = new CategoryEntity();
+        queryEntity.setParentId(parentId);
+        queryEntity.setCategoryType(categoryType);
+        queryEntity.setCategoryName(categoryEntity.getCategoryName());
+        queryEntity.setDeletedFlag(false);
+        queryEntity = categoryDao.selectOne(queryEntity);
+        if (null != queryEntity) {
+            if (isUpdate) {
+                if (!Objects.equals(queryEntity.getCategoryId(), categoryEntity.getCategoryId())) {
+                    return ResponseDTO.userErrorParam("同级下已存在相同类目~");
+                }
+            } else {
+                return ResponseDTO.userErrorParam("同级下已存在相同类目~");
+            }
+        }
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 查询 类目详情
+     *
+     * @param categoryId
+     * @return
+     */
+    public ResponseDTO<CategoryVO> queryDetail(Long categoryId) {
+        Optional<CategoryEntity> optional = categoryQueryService.queryCategory(categoryId);
+        if (!optional.isPresent()) {
+            return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
+        }
+        CategoryVO adminVO = SmartBeanUtil.copy(optional.get(), CategoryVO.class);
+        return ResponseDTO.ok(adminVO);
+    }
+
+    /**
+     * 根据父级id 查询所有子类 返回层级树
+     * 如果父类id 为空 返回所有类目层级
+     *
+     * @param queryForm
+     * @return
+     */
+    public ResponseDTO<List<CategoryTreeVO>> queryTree(CategoryTreeQueryForm queryForm) {
+        if (null == queryForm.getParentId()) {
+            if (null == queryForm.getCategoryType()) {
+                return ResponseDTO.userErrorParam("类目类型不能为空");
+            }
+            queryForm.setParentId(NumberUtils.LONG_ZERO);
+        }
+        List<CategoryTreeVO> treeList = categoryCacheManager.queryCategoryTree(queryForm.getParentId(), queryForm.getCategoryType());
+        return ResponseDTO.ok(treeList);
+    }
+
+    /**
+     * 删除类目
+     * 如果有未删除的子类 则无法删除
+     *
+     * @param categoryId
+     * @return
+     */
+    public ResponseDTO<String> delete(Long categoryId) {
+        Optional<CategoryEntity> optional = categoryQueryService.queryCategory(categoryId);
+        if (!optional.isPresent()) {
+            return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
+        }
+
+        List<Long> categorySubId = categoryQueryService.queryCategorySubId(Lists.newArrayList(categoryId));
+        if (CollectionUtils.isNotEmpty(categorySubId)) {
+            return ResponseDTO.userErrorParam("请先删除子级类目");
+        }
+
+        // 更新数据
+        CategoryEntity categoryEntity = new CategoryEntity();
+        categoryEntity.setCategoryId(categoryId);
+        categoryEntity.setDeletedFlag(true);
+        categoryDao.updateById(categoryEntity);
+
+        // 更新缓存
+        categoryCacheManager.removeCache();
+        return ResponseDTO.ok();
+    }
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/constant/GoodsStatusEnum.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/constant/GoodsStatusEnum.java
@@ -0,0 +1,42 @@
+package net.lab1024.sa.admin.module.business.goods.constant;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import net.lab1024.sa.common.common.enumeration.BaseEnum;
+
+/**
+ * 商品状态
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021-10-25 20:26:54
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@AllArgsConstructor
+@Getter
+public enum GoodsStatusEnum implements BaseEnum {
+
+    /**
+     * 1 预约中
+     */
+    APPOINTMENT(1, "预约中"),
+
+    /**
+     * 2 售卖
+     */
+    SELL(2, "售卖中"),
+
+    /**
+     * 3 售罄
+     */
+    SELL_OUT(3, "售罄"),
+
+
+    ;
+
+    private final Integer value;
+
+    private final String desc;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java
@@ -0,0 +1,75 @@
+package net.lab1024.sa.admin.module.business.goods.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import net.lab1024.sa.admin.common.AdminBaseController;
+import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
+import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsAddForm;
+import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsQueryForm;
+import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsUpdateForm;
+import net.lab1024.sa.admin.module.business.goods.domain.vo.GoodsVO;
+import net.lab1024.sa.admin.module.business.goods.service.GoodsService;
+import net.lab1024.sa.common.common.domain.PageResult;
+import net.lab1024.sa.common.common.domain.ResponseDTO;
+import net.lab1024.sa.common.common.domain.ValidateList;
+import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * 商品业务
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021-10-25 20:26:54
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@OperateLog
+@RestController
+@Api(tags = AdminSwaggerTagConst.Business.MANAGER_GOODS)
+public class GoodsController extends AdminBaseController {
+
+    @Autowired
+    private GoodsService goodsService;
+
+    @ApiOperation("分页查询 @author 胡克")
+    @PostMapping("/goods/query")
+    @PreAuthorize("@saAuth.checkPermission('goods:query')")
+    public ResponseDTO<PageResult<GoodsVO>> query(@RequestBody @Valid GoodsQueryForm queryForm) {
+        return goodsService.query(queryForm);
+    }
+
+    @ApiOperation("添加商品 @author 胡克")
+    @PostMapping("/goods/add")
+    @PreAuthorize("@saAuth.checkPermission('goods:add')")
+    public ResponseDTO<String> add(@RequestBody @Valid GoodsAddForm addForm) {
+        return goodsService.add(addForm);
+    }
+
+    @ApiOperation("更新商品 @author 胡克")
+    @PostMapping("/goods/update")
+    @PreAuthorize("@saAuth.checkPermission('goods:update')")
+    public ResponseDTO<String> update(@RequestBody @Valid GoodsUpdateForm updateForm) {
+        return goodsService.update(updateForm);
+    }
+
+    @ApiOperation("删除 @author 卓大")
+    @GetMapping("/goods/delete/{goodsId}")
+    @PreAuthorize("@saAuth.checkPermission('goods:delete')")
+    public ResponseDTO<String> delete(@PathVariable Long goodsId) {
+        return goodsService.delete(goodsId);
+    }
+
+    @ApiOperation("批量 @author 卓大")
+    @PostMapping("/goods/batchDelete")
+    @PreAuthorize("@saAuth.checkPermission('goods:batchDelete')")
+    public ResponseDTO<String> batchDelete(@RequestBody @Valid ValidateList<Long> idList) {
+        return goodsService.batchDelete(idList);
+    }
+
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/dao/GoodsDao.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/dao/GoodsDao.java
@@ -0,0 +1,41 @@
+package net.lab1024.sa.admin.module.business.goods.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import net.lab1024.sa.admin.module.business.goods.domain.entity.GoodsEntity;
+import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsQueryForm;
+import net.lab1024.sa.admin.module.business.goods.domain.vo.GoodsVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 商品
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021-10-25 20:26:54
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Mapper
+@Component
+public interface GoodsDao extends BaseMapper<GoodsEntity> {
+
+    /**
+     * 分页 查询商品
+     *
+     * @param page
+     * @param query
+     * @return
+     */
+    List<GoodsVO> query(Page page, @Param("query") GoodsQueryForm query);
+
+    /**
+     * 批量更新删除状态
+     */
+
+    void batchUpdateDeleted(@Param("goodsIdList")List<Long> goodsIdList,@Param("deletedFlag")Boolean deletedFlag);
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/entity/GoodsEntity.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/entity/GoodsEntity.java
@@ -0,0 +1,75 @@
+package net.lab1024.sa.admin.module.business.goods.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import net.lab1024.sa.admin.module.business.category.dao.CategoryDao;
+import net.lab1024.sa.common.module.support.datatracer.annoation.DataTracerFieldBigDecimal;
+import net.lab1024.sa.common.module.support.datatracer.annoation.DataTracerFieldLabel;
+import net.lab1024.sa.common.module.support.datatracer.annoation.DataTracerFieldSql;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 商品 实体类
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021-10-25 20:26:54
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+@TableName("t_goods")
+public class GoodsEntity {
+
+    @TableId(type = IdType.AUTO)
+    private Long goodsId;
+
+    /**
+     *  商品状态:[1:预约中,2:售卖中,3:售罄]
+     */
+    private Integer goodsStatus;
+
+    /**
+     * 商品分类
+     */
+    private Long categoryId;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 产地
+     */
+    private String place;
+
+    /**
+     * 商品价格
+     */
+    private BigDecimal price;
+
+
+    /**
+     * 上架状态
+     */
+    private Boolean shelvesFlag;
+
+    /**
+     * 删除状态
+     */
+    private Boolean deletedFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private LocalDateTime updateTime;
+
+    private LocalDateTime createTime;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java
@@ -0,0 +1,57 @@
+package net.lab1024.sa.admin.module.business.goods.domain.form;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
+import net.lab1024.sa.common.common.json.deserializer.DictValueVoDeserializer;
+import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
+import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * 商品 添加表单
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021-10-25 20:26:54
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class GoodsAddForm {
+
+    @ApiModelProperty("商品分类")
+    @NotNull(message = "商品分类不能为空")
+    private Long categoryId;
+
+    @ApiModelProperty("商品名称")
+    @NotBlank(message = "商品名称不能为空")
+    private String goodsName;
+
+    @ApiModelPropertyEnum(GoodsStatusEnum.class)
+    @CheckEnum(message = "商品状态错误", value = GoodsStatusEnum.class, required = true)
+    private Integer goodsStatus;
+
+    @ApiModelProperty("产地")
+    @NotBlank(message = "产地 不能为空 ")
+    @JsonDeserialize(using = DictValueVoDeserializer.class)
+    private String place;
+
+    @ApiModelProperty("商品价格")
+    @NotNull(message = "商品价格不能为空")
+    @DecimalMin(value = "0", message = "商品价格最低0")
+    private BigDecimal price;
+
+    @ApiModelProperty("上架状态")
+    @NotNull(message = "上架状态不能为空")
+    private Boolean shelvesFlag;
+
+    @ApiModelProperty("备注|可选")
+    private String remark;
+}
--- 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
@@ -0,0 +1,46 @@
+package net.lab1024.sa.admin.module.business.goods.domain.form;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
+import net.lab1024.sa.common.common.domain.PageParam;
+import net.lab1024.sa.common.common.json.deserializer.DictValueVoDeserializer;
+import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
+import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 商品 分页查询
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021-10-25 20:26:54
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class GoodsQueryForm extends PageParam {
+
+    @ApiModelProperty("商品分类")
+    private Integer categoryId;
+
+    @ApiModelProperty("搜索词")
+    @Length(max = 30, message = "搜索词最多30字符")
+    private String searchWord;
+
+    @ApiModelPropertyEnum(GoodsStatusEnum.class)
+    @CheckEnum(message = "商品状态错误", value = GoodsStatusEnum.class, required = false)
+    private Integer goodsStatus;
+
+    @ApiModelProperty("产地")
+    private String place;
+
+    @ApiModelProperty("上架状态")
+    private Boolean shelvesFlag;
+
+    @ApiModelProperty(hidden = true)
+    private Boolean deletedFlag;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsUpdateForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsUpdateForm.java
@@ -0,0 +1,23 @@
+package net.lab1024.sa.admin.module.business.goods.domain.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 商品 更新表单
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021-10-25 20:26:54
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class GoodsUpdateForm extends GoodsAddForm {
+
+    @ApiModelProperty("商品id")
+    @NotNull(message = "商品id不能为空")
+    private Long goodsId;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsVO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsVO.java
@@ -0,0 +1,56 @@
+package net.lab1024.sa.admin.module.business.goods.domain.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
+import net.lab1024.sa.common.common.json.serializer.DictValueVoSerializer;
+import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 商品
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021-10-25 20:26:54
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class GoodsVO  {
+
+    @ApiModelProperty("商品分类")
+    private Long categoryId;
+
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    @ApiModelPropertyEnum(GoodsStatusEnum.class)
+    private Integer goodsStatus;
+
+    @ApiModelProperty("产地")
+    @JsonSerialize(using = DictValueVoSerializer.class)
+    private String place;
+
+    @ApiModelProperty("商品价格")
+    private BigDecimal price;
+
+    @ApiModelProperty("上架状态")
+    private Boolean shelvesFlag;
+
+    @ApiModelProperty("备注|可选")
+    private String remark;
+
+    @ApiModelProperty("商品id")
+    private Long goodsId;
+
+    @ApiModelProperty("商品分类")
+    private String categoryName;
+
+    private LocalDateTime updateTime;
+
+    private LocalDateTime createTime;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/manager/GoodsManager.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/manager/GoodsManager.java
@@ -0,0 +1,20 @@
+package net.lab1024.sa.admin.module.business.goods.manager;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import net.lab1024.sa.admin.module.business.goods.dao.GoodsDao;
+import net.lab1024.sa.admin.module.business.goods.domain.entity.GoodsEntity;
+import org.springframework.stereotype.Service;
+
+/**
+ * 商品 manager
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021-10-25 20:26:54
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Service
+public class GoodsManager extends ServiceImpl<GoodsDao, GoodsEntity> {
+
+}
--- 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
@@ -0,0 +1,168 @@
+package net.lab1024.sa.admin.module.business.goods.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
+import net.lab1024.sa.admin.module.business.category.domain.entity.CategoryEntity;
+import net.lab1024.sa.admin.module.business.category.service.CategoryQueryService;
+import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
+import net.lab1024.sa.admin.module.business.goods.dao.GoodsDao;
+import net.lab1024.sa.admin.module.business.goods.domain.entity.GoodsEntity;
+import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsAddForm;
+import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsQueryForm;
+import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsUpdateForm;
+import net.lab1024.sa.admin.module.business.goods.domain.vo.GoodsVO;
+import net.lab1024.sa.admin.module.business.goods.manager.GoodsManager;
+import net.lab1024.sa.common.common.code.UserErrorCode;
+import net.lab1024.sa.common.common.domain.PageResult;
+import net.lab1024.sa.common.common.domain.ResponseDTO;
+import net.lab1024.sa.common.common.util.SmartBeanUtil;
+import net.lab1024.sa.common.common.util.SmartPageUtil;
+import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerTypeEnum;
+import net.lab1024.sa.common.module.support.datatracer.service.DataTracerService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * 商品
+ *
+ * @Author 1024创新实验室: 胡克
+ * @Date 2021-10-25 20:26:54
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Service
+public class GoodsService {
+    @Autowired
+    private GoodsDao goodsDao;
+
+    @Autowired
+    private CategoryQueryService categoryQueryService;
+
+    @Autowired
+    private DataTracerService dataTracerService;
+
+    /**
+     * 添加商品
+     *
+     * @param addForm
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseDTO<String> add(GoodsAddForm addForm) {
+        // 商品校验
+        ResponseDTO<String> res = this.checkGoods(addForm, null);
+        if (!res.getOk()) {
+            return res;
+        }
+        GoodsEntity goodsEntity = SmartBeanUtil.copy(addForm, GoodsEntity.class);
+        goodsEntity.setDeletedFlag(Boolean.FALSE);
+        goodsDao.insert(goodsEntity);
+        dataTracerService.insert(goodsEntity.getGoodsId(), DataTracerTypeEnum.GOODS);
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 更新商品
+     *
+     * @param updateForm
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseDTO<String> update(GoodsUpdateForm updateForm) {
+        // 商品校验
+        ResponseDTO<String> res = this.checkGoods(updateForm, updateForm.getGoodsId());
+        if (!res.getOk()) {
+            return res;
+        }
+        GoodsEntity originEntity = goodsDao.selectById(updateForm.getGoodsId());
+        GoodsEntity goodsEntity = SmartBeanUtil.copy(updateForm, GoodsEntity.class);
+        goodsDao.updateById(goodsEntity);
+        dataTracerService.update(updateForm.getGoodsId(), DataTracerTypeEnum.GOODS, originEntity, goodsEntity);
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 添加/更新 商品校验
+     *
+     * @param addForm
+     * @param goodsId 不为空 代表更新商品
+     * @return
+     */
+    private ResponseDTO<String> checkGoods(GoodsAddForm addForm, Long goodsId) {
+        // 校验类目id
+        Long categoryId = addForm.getCategoryId();
+        Optional<CategoryEntity> optional = categoryQueryService.queryCategory(categoryId);
+        if (!optional.isPresent() || !CategoryTypeEnum.GOODS.equalsValue(optional.get().getCategoryType())) {
+            return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST, "商品类目不存在~");
+        }
+
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseDTO<String> delete(Long goodsId) {
+        GoodsEntity goodsEntity = goodsDao.selectById(goodsId);
+        if (goodsEntity == null) {
+            return ResponseDTO.userErrorParam("商品不存在");
+        }
+
+        if (!goodsEntity.getGoodsStatus().equals(GoodsStatusEnum.SELL_OUT.getValue())) {
+            return ResponseDTO.userErrorParam("只有售罄的商品才可以删除");
+        }
+
+        batchDelete(Arrays.asList(goodsId));
+        dataTracerService.batchDelete(Arrays.asList(goodsId), DataTracerTypeEnum.GOODS);
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 批量删除
+     */
+    public ResponseDTO<String> batchDelete(List<Long> goodsIdList) {
+        if (CollectionUtils.isEmpty(goodsIdList)) {
+            return ResponseDTO.ok();
+        }
+
+        goodsDao.batchUpdateDeleted(goodsIdList, Boolean.TRUE);
+        return ResponseDTO.ok();
+    }
+
+
+    /**
+     * 分页查询
+     *
+     * @param queryForm
+     * @return
+     */
+    public ResponseDTO<PageResult<GoodsVO>> query(GoodsQueryForm queryForm) {
+        queryForm.setDeletedFlag(false);
+        Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
+        List<GoodsVO> list = goodsDao.query(page, queryForm);
+        PageResult<GoodsVO> pageResult = SmartPageUtil.convert2PageResult(page, list);
+        if (pageResult.getEmptyFlag()) {
+            return ResponseDTO.ok(pageResult);
+        }
+        // 查询分类名称
+        List<Long> categoryIdList = list.stream().map(GoodsVO::getCategoryId).distinct().collect(Collectors.toList());
+        Map<Long, CategoryEntity> categoryMap = categoryQueryService.queryCategoryList(categoryIdList);
+        list.forEach(e -> {
+            CategoryEntity categoryEntity = categoryMap.get(e.getCategoryId());
+            if (categoryEntity != null) {
+                e.setCategoryName(categoryEntity.getCategoryName());
+            }
+        });
+        return ResponseDTO.ok(pageResult);
+    }
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java
@@ -0,0 +1,74 @@
+package net.lab1024.sa.admin.module.business.oa.bank;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
+import net.lab1024.sa.admin.module.business.oa.bank.domain.BankCreateForm;
+import net.lab1024.sa.admin.module.business.oa.bank.domain.BankQueryForm;
+import net.lab1024.sa.admin.module.business.oa.bank.domain.BankUpdateForm;
+import net.lab1024.sa.admin.module.business.oa.bank.domain.BankVO;
+import net.lab1024.sa.common.common.domain.PageResult;
+import net.lab1024.sa.common.common.domain.RequestUser;
+import net.lab1024.sa.common.common.domain.ResponseDTO;
+import net.lab1024.sa.common.common.util.SmartRequestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * OA办公-OA银行信息
+ *
+ * @Author 1024创新实验室:善逸
+ * @Date 2022/6/23 21:59:22
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@RestController
+@Api(tags = {AdminSwaggerTagConst.Business.OA_BANK})
+public class BankController {
+
+    @Autowired
+    private BankService bankService;
+
+    @ApiOperation(value = "分页查询银行信息 @author 善逸")
+    @PostMapping("/oa/bank/page/query")
+    public ResponseDTO<PageResult<BankVO>> queryByPage(@RequestBody @Valid BankQueryForm queryDTO) {
+        return bankService.queryByPage(queryDTO);
+    }
+
+    @ApiOperation(value = "根据企业ID查询银行信息列表 @author 善逸")
+    @GetMapping("/oa/bank/query/list/{enterpriseId}")
+    public ResponseDTO<List<BankVO>> queryList(@PathVariable Long enterpriseId) {
+        return bankService.queryList(enterpriseId);
+    }
+
+    @ApiOperation(value = "查询银行信息详情 @author 善逸")
+    @GetMapping("/oa/bank/get/{bankId}")
+    public ResponseDTO<BankVO> getDetail(@PathVariable Long bankId) {
+        return bankService.getDetail(bankId);
+    }
+
+    @ApiOperation(value = "新建银行信息 @author 善逸")
+    @PostMapping("/oa/bank/create")
+    public ResponseDTO<String> createBank(@RequestBody @Valid BankCreateForm createVO) {
+        RequestUser requestUser = SmartRequestUtil.getRequestUser();
+        createVO.setCreateUserId(requestUser.getUserId());
+        createVO.setCreateUserName(requestUser.getUserName());
+        return bankService.createBank(createVO);
+    }
+
+    @ApiOperation(value = "编辑银行信息 @author 善逸")
+    @PostMapping("/oa/bank/update")
+    public ResponseDTO<String> updateBank(@RequestBody @Valid BankUpdateForm updateVO) {
+        return bankService.updateBank(updateVO);
+    }
+
+    @ApiOperation(value = "删除银行信息 @author 善逸")
+    @GetMapping("/oa/bank/delete/{bankId}")
+    public ResponseDTO<String> deleteBank(@PathVariable Long bankId) {
+        return bankService.deleteBank(bankId);
+    }
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankDao.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankDao.java
@@ -0,0 +1,61 @@
+package net.lab1024.sa.admin.module.business.oa.bank;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import net.lab1024.sa.admin.module.business.oa.bank.domain.BankEntity;
+import net.lab1024.sa.admin.module.business.oa.bank.domain.BankQueryForm;
+import net.lab1024.sa.admin.module.business.oa.bank.domain.BankVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * OA办公-OA银行信息
+ *
+ * @Author 1024创新实验室:善逸
+ * @Date 2022/6/23 21:59:22
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Mapper
+@Component
+public interface BankDao extends BaseMapper<BankEntity> {
+
+    /**
+     * 根据账号查询
+     * @param enterpriseId
+     * @param accountNumber
+     * @param excludeBankId
+     * @param deletedFlag
+     * @return
+     */
+    BankEntity queryByAccountNumber(@Param("enterpriseId") Long enterpriseId, @Param("accountNumber") String accountNumber, @Param("excludeBankId") Long excludeBankId, @Param("deletedFlag") Boolean deletedFlag);
+
+    /**
+     * 删除银行信息
+     *
+     * @param bankId
+     * @param deletedFlag
+     */
+    void deleteBank(@Param("bankId") Long bankId, @Param("deletedFlag") Boolean deletedFlag);
+
+    /**
+     * 银行信息分页查询
+     *
+     * @param page
+     * @param queryForm
+     * @return
+     */
+    List<BankVO> queryPage(Page page, @Param("queryForm") BankQueryForm queryForm);
+
+    /**
+     * 查询银行信息详情
+     * @param bankId
+     * @param deletedFlag
+     * @return
+     */
+    BankVO getDetail(@Param("bankId") Long bankId, @Param("deletedFlag") Boolean deletedFlag);
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java
@@ -0,0 +1,162 @@
+package net.lab1024.sa.admin.module.business.oa.bank;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import net.lab1024.sa.admin.module.business.oa.bank.domain.*;
+import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseDao;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEntity;
+import net.lab1024.sa.common.common.domain.PageResult;
+import net.lab1024.sa.common.common.domain.ResponseDTO;
+import net.lab1024.sa.common.common.util.SmartBeanUtil;
+import net.lab1024.sa.common.common.util.SmartPageUtil;
+import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerConst;
+import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerTypeEnum;
+import net.lab1024.sa.common.module.support.datatracer.service.DataTracerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * OA办公-OA银行信息
+ *
+ * @Author 1024创新实验室:善逸
+ * @Date 2022/6/23 21:59:22
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Service
+@Slf4j
+public class BankService {
+
+    @Autowired
+    private BankDao bankDao;
+    @Autowired
+    private EnterpriseDao enterpriseDao;
+
+    @Autowired
+    private DataTracerService dataTracerService;
+
+    /**
+     * 分页查询银行信息
+     *
+     * @param queryDTO
+     * @return
+     */
+    public ResponseDTO<PageResult<BankVO>> queryByPage(BankQueryForm queryDTO) {
+        queryDTO.setDeletedFlag(Boolean.FALSE);
+        Page<?> page = SmartPageUtil.convert2PageQuery(queryDTO);
+        List<BankVO> bankVOS = bankDao.queryPage(page, queryDTO);
+        PageResult<BankVO> pageResult = SmartPageUtil.convert2PageResult(page, bankVOS);
+        return ResponseDTO.ok(pageResult);
+    }
+
+    /**
+     * 根据企业ID查询不分页的银行列表
+     *
+     * @param enterpriseId
+     * @return
+     */
+    public ResponseDTO<List<BankVO>> queryList(Long enterpriseId) {
+        BankQueryForm queryDTO = new BankQueryForm();
+        queryDTO.setEnterpriseId(enterpriseId);
+        queryDTO.setDeletedFlag(Boolean.FALSE);
+        List<BankVO> bankVOS = bankDao.queryPage(null, queryDTO);
+        return ResponseDTO.ok(bankVOS);
+    }
+
+    /**
+     * 查询银行信息详情
+     *
+     * @param bankId
+     * @return
+     */
+    public ResponseDTO<BankVO> getDetail(Long bankId) {
+        // 校验银行信息是否存在
+        BankVO bankVO = bankDao.getDetail(bankId, Boolean.FALSE);
+        if (Objects.isNull(bankVO)) {
+            return ResponseDTO.userErrorParam("银行信息不存在");
+        }
+        return ResponseDTO.ok(bankVO);
+    }
+
+    /**
+     * 新建银行信息
+     *
+     * @param createVO
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseDTO<String> createBank(BankCreateForm createVO) {
+        Long enterpriseId = createVO.getEnterpriseId();
+        // 校验企业是否存在
+        EnterpriseEntity enterpriseDetail = enterpriseDao.selectById(enterpriseId);
+        if (Objects.isNull(enterpriseDetail) || enterpriseDetail.getDeletedFlag()) {
+            return ResponseDTO.userErrorParam("企业不存在");
+        }
+        // 验证银行信息账号是否重复
+        BankEntity validateBank = bankDao.queryByAccountNumber(enterpriseId, createVO.getAccountNumber(), null, Boolean.FALSE);
+        if (Objects.nonNull(validateBank)) {
+            return ResponseDTO.userErrorParam("银行信息账号重复");
+        }
+        // 数据插入
+        BankEntity insertBank = SmartBeanUtil.copy(createVO, BankEntity.class);
+        bankDao.insert(insertBank);
+        dataTracerService.addTrace(enterpriseId, DataTracerTypeEnum.OA_ENTERPRISE, "新增银行:" + DataTracerConst.HTML_BR + dataTracerService.getChangeContent(insertBank));
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 编辑银行信息
+     *
+     * @param updateVO
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseDTO<String> updateBank(BankUpdateForm updateVO) {
+        Long enterpriseId = updateVO.getEnterpriseId();
+        // 校验企业是否存在
+        EnterpriseEntity enterpriseDetail = enterpriseDao.selectById(enterpriseId);
+        if (Objects.isNull(enterpriseDetail) || enterpriseDetail.getDeletedFlag()) {
+            return ResponseDTO.userErrorParam("企业不存在");
+        }
+        Long bankId = updateVO.getBankId();
+        // 校验银行信息是否存在
+        BankEntity bankDetail = bankDao.selectById(bankId);
+        if (Objects.isNull(bankDetail) || bankDetail.getDeletedFlag()) {
+            return ResponseDTO.userErrorParam("银行信息不存在");
+        }
+        // 验证银行信息账号是否重复
+        BankEntity validateBank = bankDao.queryByAccountNumber(updateVO.getEnterpriseId(), updateVO.getAccountNumber(), bankId, Boolean.FALSE);
+        if (Objects.nonNull(validateBank)) {
+            return ResponseDTO.userErrorParam("银行信息账号重复");
+        }
+        // 数据编辑
+        BankEntity updateBank = SmartBeanUtil.copy(updateVO, BankEntity.class);
+        bankDao.updateById(updateBank);
+        dataTracerService.addTrace(enterpriseId, DataTracerTypeEnum.OA_ENTERPRISE, "更新银行:" + DataTracerConst.HTML_BR + dataTracerService.getChangeContent(bankDetail, updateBank));
+        return ResponseDTO.ok();
+    }
+
+
+    /**
+     * 删除银行信息
+     *
+     * @param bankId
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseDTO<String> deleteBank(Long bankId) {
+        // 校验银行信息是否存在
+        BankEntity bankDetail = bankDao.selectById(bankId);
+        if (Objects.isNull(bankDetail) || bankDetail.getDeletedFlag()) {
+            return ResponseDTO.userErrorParam("银行信息不存在");
+        }
+        bankDao.deleteBank(bankId, Boolean.TRUE);
+        dataTracerService.addTrace(bankDetail.getEnterpriseId(), DataTracerTypeEnum.OA_ENTERPRISE, "删除银行:" + DataTracerConst.HTML_BR + dataTracerService.getChangeContent(bankDetail));
+        return ResponseDTO.ok();
+    }
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankCreateForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankCreateForm.java
@@ -0,0 +1,58 @@
+package net.lab1024.sa.admin.module.business.oa.bank.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * OA办公-银行信息新建
+ *
+ * @Author 1024创新实验室:善逸
+ * @Date 2022/6/23 21:59:22
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class BankCreateForm {
+
+    @ApiModelProperty("开户银行")
+    @NotBlank(message = "开户银行不能为空")
+    @Length(max = 200, message = "开户银行最多200字符")
+    private String bankName;
+
+    @ApiModelProperty("账户名称")
+    @NotBlank(message = "账户名称不能为空")
+    @Length(max = 200, message = "账户名称最多200字符")
+    private String accountName;
+
+    @ApiModelProperty("账号")
+    @NotBlank(message = "账号不能为空")
+    @Length(max = 200, message = "账号最多200字符")
+    private String accountNumber;
+
+    @ApiModelProperty("备注")
+    @Length(max = 500, message = "备注最多500字符")
+    private String remark;
+
+    @ApiModelProperty("是否对公")
+    @NotNull(message = "是否对公不能为空")
+    private Boolean businessFlag;
+
+    @ApiModelProperty("企业")
+    @NotNull(message = "企业不能为空")
+    private Long enterpriseId;
+
+    @ApiModelProperty("禁用状态")
+    @NotNull(message = "禁用状态不能为空")
+    private Boolean disabledFlag;
+
+    @ApiModelProperty(value = "创建人", hidden = true)
+    private Long createUserId;
+
+    @ApiModelProperty(value = "创建人", hidden = true)
+    private String createUserName;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankEntity.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankEntity.java
@@ -0,0 +1,95 @@
+package net.lab1024.sa.admin.module.business.oa.bank.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import net.lab1024.sa.common.module.support.datatracer.annoation.DataTracerFieldLabel;
+
+import java.time.LocalDateTime;
+
+/**
+ * OA办公-OA银行信息
+ *
+ * @Author 1024创新实验室:善逸
+ * @Date 2022/6/23 21:59:22
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+@TableName("t_oa_bank")
+public class BankEntity {
+
+    /**
+     * 银行信息ID
+     */
+    @TableId(type = IdType.AUTO)
+    @DataTracerFieldLabel("银行信息ID")
+    private Long bankId;
+
+    /**
+     * 开户银行
+     */
+    @DataTracerFieldLabel("开户银行")
+    private String bankName;
+
+    /**
+     * 账户名称
+     */
+    @DataTracerFieldLabel("账户名称")
+    private String accountName;
+
+    /**
+     * 账号
+     */
+    @DataTracerFieldLabel("账号")
+    private String accountNumber;
+
+    /**
+     * 备注
+     */
+    @DataTracerFieldLabel("备注")
+    private String remark;
+
+    /**
+     * 是否对公
+     */
+    @DataTracerFieldLabel("是否对公")
+    private Boolean businessFlag;
+
+    /**
+     * 企业ID
+     */
+    private Long enterpriseId;
+
+    /**
+     * 禁用状态
+     */
+    @DataTracerFieldLabel("禁用状态")
+    private Boolean disabledFlag;
+
+    /**
+     * 删除状态
+     */
+    private Boolean deletedFlag;
+
+    /**
+     * 创建人ID
+     */
+    private Long createUserId;
+
+    /**
+     * 创建人ID
+     */
+    private String createUserName;
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankQueryForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankQueryForm.java
@@ -0,0 +1,40 @@
+package net.lab1024.sa.admin.module.business.oa.bank.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.common.common.domain.PageParam;
+import org.hibernate.validator.constraints.Length;
+
+import java.time.LocalDate;
+
+/**
+ * OA办公-OA银行信息查询
+ *
+ * @Author 1024创新实验室:善逸
+ * @Date 2022/6/23 21:59:22
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class BankQueryForm extends PageParam {
+
+    @ApiModelProperty("企业ID")
+    private Long enterpriseId;
+
+    @ApiModelProperty("关键字")
+    @Length(max = 200, message = "关键字最多200字符")
+    private String keywords;
+
+    @ApiModelProperty("开始时间")
+    private LocalDate startTime;
+
+    @ApiModelProperty("结束时间")
+    private LocalDate endTime;
+
+    @ApiModelProperty("禁用状态")
+    private Boolean disabledFlag;
+
+    @ApiModelProperty(value = "删除状态", hidden = true)
+    private Boolean deletedFlag;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankUpdateForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankUpdateForm.java
@@ -0,0 +1,23 @@
+package net.lab1024.sa.admin.module.business.oa.bank.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * OA办公-银行信息更新
+ *
+ * @Author 1024创新实验室:善逸
+ * @Date 2022/6/23 21:59:22
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class BankUpdateForm extends BankCreateForm {
+
+    @ApiModelProperty("银行信息ID")
+    @NotNull(message = "银行信息ID不能为空")
+    private Long bankId;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankVO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankVO.java
@@ -0,0 +1,58 @@
+package net.lab1024.sa.admin.module.business.oa.bank.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * OA办公-OA银行信息
+ *
+ * @Author 1024创新实验室:善逸
+ * @Date 2022/6/23 21:59:22
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class BankVO {
+
+    @ApiModelProperty("银行信息ID")
+    private Long bankId;
+
+    @ApiModelProperty("开户银行")
+    private String bankName;
+
+    @ApiModelProperty("账户名称")
+    private String accountName;
+
+    @ApiModelProperty("账号")
+    private String accountNumber;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("是否对公")
+    private Boolean businessFlag;
+
+    @ApiModelProperty("企业ID")
+    private Long enterpriseId;
+
+    @ApiModelProperty("企业名称")
+    private String enterpriseName;
+
+    @ApiModelProperty("禁用状态")
+    private Boolean disabledFlag;
+
+    @ApiModelProperty("创建人ID")
+    private Long createUserId;
+
+    @ApiModelProperty("创建人名称")
+    private String createUserName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java
@@ -0,0 +1,115 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.*;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
+import net.lab1024.sa.common.common.annoation.SaAuth;
+import net.lab1024.sa.common.common.domain.PageResult;
+import net.lab1024.sa.common.common.domain.RequestUser;
+import net.lab1024.sa.common.common.domain.ResponseDTO;
+import net.lab1024.sa.common.common.util.SmartRequestUtil;
+import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 企业
+ *
+ * @Author 1024创新实验室: 开云
+ * @Date 2022/7/28 20:37:15
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Slf4j
+@RestController
+@OperateLog
+@Api(tags = {AdminSwaggerTagConst.Business.OA_ENTERPRISE})
+public class EnterpriseController {
+
+    @Autowired
+    private EnterpriseService enterpriseService;
+
+    @ApiOperation(value = "分页查询企业模块 @author 开云")
+    @PostMapping("/oa/enterprise/page/query")
+    @SaAuth
+    public ResponseDTO<PageResult<EnterpriseVO>> queryByPage(@RequestBody @Valid EnterpriseQueryForm queryDTO) {
+        return enterpriseService.queryByPage(queryDTO);
+    }
+
+    @ApiOperation(value = "查询企业详情 @author 开云")
+    @GetMapping("/oa/enterprise/get/{enterpriseId}")
+    @SaAuth
+    public ResponseDTO<EnterpriseVO> getDetail(@PathVariable Long enterpriseId) {
+        return ResponseDTO.ok(enterpriseService.getDetail(enterpriseId));
+    }
+
+    @ApiOperation(value = "新建企业 @author 开云")
+    @PostMapping("/oa/enterprise/create")
+    @SaAuth
+    public ResponseDTO<String> createEnterprise(@RequestBody @Valid EnterpriseCreateForm createVO) {
+        RequestUser requestUser = SmartRequestUtil.getRequestUser();
+        createVO.setCreateUserId(requestUser.getUserId());
+        createVO.setCreateUserName(requestUser.getUserName());
+        return enterpriseService.createEnterprise(createVO);
+    }
+
+    @ApiOperation(value = "编辑企业 @author 开云")
+    @PostMapping("/oa/enterprise/update")
+    @SaAuth
+    public ResponseDTO<String> updateEnterprise(@RequestBody @Valid EnterpriseUpdateForm updateVO) {
+        return enterpriseService.updateEnterprise(updateVO);
+    }
+
+    @ApiOperation(value = "删除企业 @author 开云")
+    @GetMapping("/oa/enterprise/delete/{enterpriseId}")
+    @SaAuth
+    public ResponseDTO<String> deleteEnterprise(@PathVariable Long enterpriseId) {
+        return enterpriseService.deleteEnterprise(enterpriseId);
+    }
+
+    @ApiOperation(value = "企业列表查询 @author 开云")
+    @GetMapping("/oa/enterprise/query/list")
+    @SaAuth
+    public ResponseDTO<List<EnterpriseListVO>> queryList(@RequestParam(value = "type", required = false) Integer type) {
+        return enterpriseService.queryList(type);
+    }
+
+
+    @ApiOperation(value = "企业添加员工 @author 罗伊")
+    @PostMapping("/oa/enterprise/employee/add")
+    @SaAuth
+    public ResponseDTO<String> addEmployee(@RequestBody @Valid EnterpriseEmployeeForm enterpriseEmployeeForm) {
+        return enterpriseService.addEmployee(enterpriseEmployeeForm);
+    }
+
+    @ApiOperation(value = "查询企业全部员工 @author 罗伊")
+    @PostMapping("/oa/enterprise/employee/list")
+    @SaAuth
+    public ResponseDTO<List<EnterpriseEmployeeVO>> employeeList(@RequestBody @Valid List<Long> enterpriseIdList) {
+        return ResponseDTO.ok(enterpriseService.employeeList(enterpriseIdList));
+    }
+
+    @ApiOperation(value = "分页查询企业员工 @author 卓大")
+    @PostMapping("/oa/enterprise/employee/queryPage")
+    @SaAuth
+    public ResponseDTO<PageResult<EnterpriseEmployeeVO>> queryPageEmployeeList(@RequestBody @Valid EnterpriseEmployeeQueryForm queryForm) {
+        return ResponseDTO.ok(enterpriseService.queryPageEmployeeList(queryForm));
+    }
+
+
+    @ApiOperation(value = "企业删除员工 @author 罗伊")
+    @PostMapping("/oa/enterprise/employee/delete")
+    @SaAuth
+    public ResponseDTO<String> deleteEmployee(@RequestBody @Valid EnterpriseEmployeeForm enterpriseEmployeeForm) {
+        return enterpriseService.deleteEmployee(enterpriseEmployeeForm);
+    }
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java
@@ -0,0 +1,19 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseEmployeeDao;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEmployeeEntity;
+import org.springframework.stereotype.Service;
+
+/**
+ * 企业员工关系 manager
+ *
+ * @Author 1024创新实验室: 罗伊
+ * @Date 2022/7/28 20:37:15
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Service
+public class EnterpriseEmployeeManager extends ServiceImpl<EnterpriseEmployeeDao, EnterpriseEmployeeEntity> {
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java
@@ -0,0 +1,252 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
+import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseDao;
+import net.lab1024.sa.admin.module.business.oa.enterprise.dao.EnterpriseEmployeeDao;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEmployeeEntity;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEntity;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.*;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
+import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
+import net.lab1024.sa.common.common.code.UserErrorCode;
+import net.lab1024.sa.common.common.domain.PageResult;
+import net.lab1024.sa.common.common.domain.ResponseDTO;
+import net.lab1024.sa.common.common.util.SmartBeanUtil;
+import net.lab1024.sa.common.common.util.SmartPageUtil;
+import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerTypeEnum;
+import net.lab1024.sa.common.module.support.datatracer.domain.form.DataTracerForm;
+import net.lab1024.sa.common.module.support.datatracer.service.DataTracerService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * 企业
+ *
+ * @Author 1024创新实验室: 开云
+ * @Date 2022/7/28 20:37:15
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Service
+@Slf4j
+public class EnterpriseService {
+
+    @Autowired
+    private EnterpriseDao enterpriseDao;
+
+    @Autowired
+    private EnterpriseEmployeeDao enterpriseEmployeeDao;
+
+    @Autowired
+    private EnterpriseEmployeeManager enterpriseEmployeeManager;
+
+    @Autowired
+    private DataTracerService dataTracerService;
+
+    @Autowired
+    private DepartmentService departmentService;
+
+    /**
+     * 分页查询企业模块
+     *
+     * @param queryDTO
+     * @return
+     */
+    public ResponseDTO<PageResult<EnterpriseVO>> queryByPage(EnterpriseQueryForm queryDTO) {
+        queryDTO.setDeletedFlag(Boolean.FALSE);
+        Page<?> page = SmartPageUtil.convert2PageQuery(queryDTO);
+        List<EnterpriseVO> enterpriseVOS = enterpriseDao.queryPage(page, queryDTO);
+        PageResult<EnterpriseVO> pageResult = SmartPageUtil.convert2PageResult(page, enterpriseVOS);
+        return ResponseDTO.ok(pageResult);
+    }
+
+    /**
+     * 查询企业详情
+     *
+     * @param enterpriseId
+     * @return
+     */
+    public EnterpriseVO getDetail(Long enterpriseId) {
+        EnterpriseVO enterpriseDetail = enterpriseDao.getDetail(enterpriseId, Boolean.FALSE);
+        return enterpriseDetail;
+    }
+
+    /**
+     * 新建企业
+     *
+     * @param createVO
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseDTO<String> createEnterprise(EnterpriseCreateForm createVO) {
+        // 验证企业名称是否重复
+        EnterpriseEntity validateEnterprise = enterpriseDao.queryByEnterpriseName(createVO.getEnterpriseName(), null, Boolean.FALSE);
+        if (Objects.nonNull(validateEnterprise)) {
+            return ResponseDTO.userErrorParam("企业名称重复");
+        }
+        // 数据插入
+        EnterpriseEntity insertEnterprise = SmartBeanUtil.copy(createVO, EnterpriseEntity.class);
+        enterpriseDao.insert(insertEnterprise);
+        dataTracerService.insert(insertEnterprise.getEnterpriseId(), DataTracerTypeEnum.OA_ENTERPRISE);
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 编辑企业
+     *
+     * @param updateVO
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseDTO<String> updateEnterprise(EnterpriseUpdateForm updateVO) {
+        Long enterpriseId = updateVO.getEnterpriseId();
+        // 校验企业是否存在
+        EnterpriseEntity enterpriseDetail = enterpriseDao.selectById(enterpriseId);
+        if (Objects.isNull(enterpriseDetail) || enterpriseDetail.getDeletedFlag()) {
+            return ResponseDTO.userErrorParam("企业不存在");
+        }
+        // 验证企业名称是否重复
+        EnterpriseEntity validateEnterprise = enterpriseDao.queryByEnterpriseName(updateVO.getEnterpriseName(), enterpriseId, Boolean.FALSE);
+        if (Objects.nonNull(validateEnterprise)) {
+            return ResponseDTO.userErrorParam("企业名称重复");
+        }
+        // 数据编辑
+        EnterpriseEntity updateEntity = SmartBeanUtil.copy(enterpriseDetail, EnterpriseEntity.class);
+        SmartBeanUtil.copyProperties(updateVO, updateEntity);
+        enterpriseDao.updateById(updateEntity);
+
+        //变更记录
+        DataTracerForm dataTracerForm = DataTracerForm.builder()
+                .dataId(updateVO.getEnterpriseId())
+                .type(DataTracerTypeEnum.OA_ENTERPRISE)
+                .content("修改企业信息")
+                .diffOld(dataTracerService.getChangeContent(enterpriseDetail))
+                .diffNew(dataTracerService.getChangeContent(updateEntity))
+                .build();
+
+        dataTracerService.addTrace(dataTracerForm);
+        return ResponseDTO.ok();
+    }
+
+
+    /**
+     * 删除企业
+     *
+     * @param enterpriseId
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseDTO<String> deleteEnterprise(Long enterpriseId) {
+        // 校验企业是否存在
+        EnterpriseEntity enterpriseDetail = enterpriseDao.selectById(enterpriseId);
+        if (Objects.isNull(enterpriseDetail) || enterpriseDetail.getDeletedFlag()) {
+            return ResponseDTO.userErrorParam("企业不存在");
+        }
+        enterpriseDao.deleteEnterprise(enterpriseId, Boolean.TRUE);
+        dataTracerService.delete(enterpriseId, DataTracerTypeEnum.OA_ENTERPRISE);
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 企业列表查询
+     *
+     * @return
+     */
+    public ResponseDTO<List<EnterpriseListVO>> queryList(Integer type) {
+        List<EnterpriseListVO> enterpriseListVOS = enterpriseDao.queryList(type, Boolean.FALSE, Boolean.FALSE);
+        return ResponseDTO.ok(enterpriseListVOS);
+    }
+
+    //----------------------------------------- 以下为员工相关--------------------------------------------
+
+    /**
+     * 企业添加员工
+     *
+     * @param enterpriseEmployeeForm
+     * @return
+     */
+    public synchronized ResponseDTO<String> addEmployee(EnterpriseEmployeeForm enterpriseEmployeeForm) {
+        Long enterpriseId = enterpriseEmployeeForm.getEnterpriseId();
+        EnterpriseEntity enterpriseEntity = enterpriseDao.selectById(enterpriseId);
+        if (enterpriseEntity == null || enterpriseEntity.getDeletedFlag()) {
+            return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
+        }
+        //过滤掉已存在的员工
+        List<Long> waitAddEmployeeIdList = enterpriseEmployeeForm.getEmployeeIdList();
+        List<EnterpriseEmployeeEntity> enterpriseEmployeeEntityList = enterpriseEmployeeDao.selectByEnterpriseAndEmployeeIdList(enterpriseId, waitAddEmployeeIdList);
+        if (CollectionUtils.isNotEmpty(enterpriseEmployeeEntityList)) {
+            List<Long> existEmployeeIdList = enterpriseEmployeeEntityList.stream().map(EnterpriseEmployeeEntity::getEmployeeId).collect(Collectors.toList());
+            waitAddEmployeeIdList = waitAddEmployeeIdList.stream().filter(e -> !existEmployeeIdList.contains(e)).collect(Collectors.toList());
+        }
+        if (CollectionUtils.isEmpty(waitAddEmployeeIdList)) {
+            return ResponseDTO.ok();
+        }
+        List<EnterpriseEmployeeEntity> batchAddList = Lists.newArrayList();
+        for (Long employeeId : waitAddEmployeeIdList) {
+            EnterpriseEmployeeEntity enterpriseEmployeeEntity = new EnterpriseEmployeeEntity();
+            enterpriseEmployeeEntity.setEnterpriseId(enterpriseId);
+            enterpriseEmployeeEntity.setEmployeeId(employeeId);
+            batchAddList.add(enterpriseEmployeeEntity);
+        }
+        enterpriseEmployeeManager.saveBatch(batchAddList);
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 企业删除员工
+     *
+     * @param enterpriseEmployeeForm
+     * @return
+     */
+    public synchronized ResponseDTO<String> deleteEmployee(EnterpriseEmployeeForm enterpriseEmployeeForm) {
+        Long enterpriseId = enterpriseEmployeeForm.getEnterpriseId();
+        EnterpriseEntity enterpriseEntity = enterpriseDao.selectById(enterpriseId);
+        if (enterpriseEntity == null || enterpriseEntity.getDeletedFlag()) {
+            return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
+        }
+        List<Long> waitDeleteEmployeeIdList = enterpriseEmployeeForm.getEmployeeIdList();
+        enterpriseEmployeeDao.deleteByEnterpriseAndEmployeeIdList(enterpriseId, waitDeleteEmployeeIdList);
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 企业下员工列表
+     *
+     * @param enterpriseIdList
+     * @return
+     */
+    public List<EnterpriseEmployeeVO> employeeList(List<Long> enterpriseIdList) {
+        if (CollectionUtils.isEmpty(enterpriseIdList)) {
+            return Lists.newArrayList();
+        }
+        List<EnterpriseEmployeeVO> enterpriseEmployeeVOList = enterpriseEmployeeDao.selectByEnterpriseIdList(enterpriseIdList);
+        return enterpriseEmployeeVOList;
+    }
+
+    /**
+     * 分页查询企业员工
+     *
+     * @param queryForm
+     * @return
+     */
+    public PageResult<EnterpriseEmployeeVO> queryPageEmployeeList(EnterpriseEmployeeQueryForm queryForm) {
+        Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
+        List<EnterpriseEmployeeVO> enterpriseEmployeeVOList = enterpriseEmployeeDao.queryPageEmployeeList(page, queryForm);
+        for (EnterpriseEmployeeVO enterpriseEmployeeVO : enterpriseEmployeeVOList) {
+            enterpriseEmployeeVO.setDepartmentName(departmentService.getDepartmentPath(enterpriseEmployeeVO.getDepartmentId()));
+        }
+        return SmartPageUtil.convert2PageResult(page, enterpriseEmployeeVOList);
+    }
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/constant/EnterpriseTypeEnum.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/constant/EnterpriseTypeEnum.java
@@ -0,0 +1,40 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise.constant;
+
+
+import net.lab1024.sa.common.common.enumeration.BaseEnum;
+
+/**
+ * 企业类型
+ *
+ * @Author 1024创新实验室: 开云
+ * @Date 2022/7/28 20:37:15
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+public enum EnterpriseTypeEnum implements BaseEnum {
+
+    NORMAL(1, "有限企业"),
+
+    FOREIGN(2, "外资企业"),
+    ;
+
+    private Integer value;
+    private String desc;
+
+    EnterpriseTypeEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+    @Override
+    public String getDesc() {
+        return desc;
+    }
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/dao/EnterpriseDao.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/dao/EnterpriseDao.java
@@ -0,0 +1,72 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEntity;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.EnterpriseQueryForm;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 企业
+ *
+ * @Author 1024创新实验室: 开云
+ * @Date 2022/7/28 20:37:15
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Mapper
+@Component
+public interface EnterpriseDao extends BaseMapper<EnterpriseEntity> {
+
+    /**
+     * 根据企业名称查询
+     *
+     * @param enterpriseName
+     * @param excludeEnterpriseId
+     * @param deletedFlag
+     * @return
+     */
+    EnterpriseEntity queryByEnterpriseName(@Param("enterpriseName") String enterpriseName, @Param("excludeEnterpriseId") Long excludeEnterpriseId, @Param("deletedFlag") Boolean deletedFlag);
+
+    /**
+     * 删除企业
+     *
+     * @param enterpriseId
+     * @param deletedFlag
+     */
+    void deleteEnterprise(@Param("enterpriseId") Long enterpriseId, @Param("deletedFlag") Boolean deletedFlag);
+
+    /**
+     * 企业分页查询
+     *
+     * @param page
+     * @param queryForm
+     * @return
+     */
+    List<EnterpriseVO> queryPage(Page page, @Param("queryForm") EnterpriseQueryForm queryForm);
+
+    /**
+     * 查询企业详情
+     *
+     * @param enterpriseId
+     * @return
+     */
+    EnterpriseVO getDetail(@Param("enterpriseId") Long enterpriseId, @Param("deletedFlag") Boolean deletedFlag);
+
+    /**
+     * 查询列表
+     *
+     * @param type
+     * @param disabledFlag
+     * @param deletedFlag
+     * @return
+     */
+    List<EnterpriseListVO> queryList(@Param("type") Integer type, @Param("disabledFlag") Boolean disabledFlag, @Param("deletedFlag") Boolean deletedFlag);
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/dao/EnterpriseEmployeeDao.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/dao/EnterpriseEmployeeDao.java
@@ -0,0 +1,88 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity.EnterpriseEmployeeEntity;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.form.EnterpriseEmployeeQueryForm;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 企业员工
+ *
+ * @Author 1024创新实验室: 罗伊
+ * @Date 2022/7/28 20:37:15
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Mapper
+@Component
+public interface EnterpriseEmployeeDao extends BaseMapper<EnterpriseEmployeeEntity> {
+
+
+    /**
+     * 根据员工查询
+     * @param employeeIdList
+     * @return
+     */
+    List<EnterpriseEmployeeVO> selectByEmployeeIdList(@Param("employeeIdList")Collection<Long> employeeIdList);
+
+    /**
+     * 查询员工关联的企业
+     * @param employeeId
+     * @return
+     */
+    List<Long> selectEnterpriseIdByEmployeeId(@Param("employeeId")Long employeeId);
+    /**
+     * 根据企业查询
+     * @param enterpriseIdList
+     * @return
+     */
+    List<EnterpriseEmployeeVO> selectByEnterpriseIdList(@Param("enterpriseIdList")Collection<Long> enterpriseIdList);
+    /**
+     * 根据企业查询
+     * @param enterpriseId
+     * @return
+     */
+    List<EnterpriseEmployeeEntity> selectByEnterpriseId(@Param("enterpriseId")Long enterpriseId);
+
+    /**
+     * 查询企业下的所有员工id
+     * @param enterpriseIdList
+     * @return
+     */
+    List<Long> selectEmployeeIdByEnterpriseIdList(@Param("enterpriseIdList")Collection<Long> enterpriseIdList);
+    /**
+     * 根据员工删除
+     * @param enterpriseId
+     * @param employeeIdList
+     */
+    void deleteByEnterpriseAndEmployeeIdList(@Param("enterpriseId")Long enterpriseId, @Param("employeeIdList")Collection<Long> employeeIdList);
+
+    /**
+     * 根据员工查询
+     * @param enterpriseId
+     * @param employeeIdList
+     */
+    List<EnterpriseEmployeeEntity> selectByEnterpriseAndEmployeeIdList(@Param("enterpriseId")Long enterpriseId, @Param("employeeIdList")Collection<Long> employeeIdList);
+
+    /**
+     * 删除某员工关联的所有企业
+     * @param employeeId
+     */
+    void deleteByEmployeeId(@Param("employeeId")Long employeeId);
+
+    /**
+     * 分页查询企业员工
+     * @param page
+     * @param queryForm
+     * @return
+     */
+    List<EnterpriseEmployeeVO> queryPageEmployeeList(Page<?> page,@Param("queryForm") EnterpriseEmployeeQueryForm queryForm);
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/entity/EnterpriseEmployeeEntity.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/entity/EnterpriseEmployeeEntity.java
@@ -0,0 +1,51 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * 企业员工
+ *
+ * @Author 1024创新实验室: 罗伊
+ * @Date 2022/7/28 20:37:15
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+@TableName("t_oa_enterprise_employee")
+@NoArgsConstructor
+public class EnterpriseEmployeeEntity {
+
+    @TableId(type = IdType.AUTO)
+    private Long enterpriseEmployeeId;
+
+    /**
+     * 企业ID
+     */
+    private Long enterpriseId;
+    /**
+     * 员工
+     */
+    private Long employeeId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    public EnterpriseEmployeeEntity(Long enterpriseId, Long employeeId) {
+        this.enterpriseId = enterpriseId;
+        this.employeeId = employeeId;
+    }
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/entity/EnterpriseEntity.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/entity/EnterpriseEntity.java
@@ -0,0 +1,153 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import net.lab1024.sa.admin.module.business.oa.enterprise.constant.EnterpriseTypeEnum;
+import net.lab1024.sa.common.module.support.datatracer.annoation.DataTracerFieldEnum;
+import net.lab1024.sa.common.module.support.datatracer.annoation.DataTracerFieldLabel;
+
+import java.time.LocalDateTime;
+
+/**
+ * 企业
+ *
+ * @Author 1024创新实验室: 开云
+ * @Date 2022/7/28 20:37:15
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+@TableName("t_oa_enterprise")
+public class EnterpriseEntity {
+
+    /**
+     * 企业ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Long enterpriseId;
+
+    /**
+     * 企业名称
+     */
+    @DataTracerFieldLabel("企业名称")
+    private String enterpriseName;
+
+    /**
+     * 企业logo
+     */
+    @DataTracerFieldLabel("企业logo")
+    private String enterpriseLogo;
+
+    /**
+     * 统一社会信用代码
+     */
+    @DataTracerFieldLabel("统一社会信用代码")
+    private String unifiedSocialCreditCode;
+
+    /**
+     * 类型
+     *
+     * @see EnterpriseTypeEnum
+     */
+    @DataTracerFieldLabel("类型")
+    @DataTracerFieldEnum(enumClass = EnterpriseTypeEnum.class)
+    private Integer type;
+
+    /**
+     * 联系人
+     */
+    @DataTracerFieldLabel("联系人")
+    private String contact;
+
+    /**
+     * 联系人电话
+     */
+    @DataTracerFieldLabel("联系人电话")
+    private String contactPhone;
+
+    /**
+     * 邮箱
+     */
+    @DataTracerFieldLabel("邮箱")
+    private String email;
+
+    /**
+     * 省份
+     */
+    private Integer province;
+
+    /**
+     * 省份名称
+     */
+    @DataTracerFieldLabel("省份名称")
+    private String provinceName;
+
+    /**
+     * 城市
+     */
+    private Integer city;
+
+    /**
+     * 城市名称
+     */
+    @DataTracerFieldLabel("城市名称")
+    private String cityName;
+
+    /**
+     * 区县
+     */
+    private Integer district;
+
+    /**
+     * 区县名称
+     */
+    @DataTracerFieldLabel("区县名称")
+    private String districtName;
+
+    /**
+     * 详细地址
+     */
+    @DataTracerFieldLabel("详细地址")
+    private String address;
+
+    /**
+     * 营业执照
+     */
+    @DataTracerFieldLabel("营业执照")
+    private String businessLicense;
+
+    /**
+     * 禁用状态
+     */
+    @DataTracerFieldLabel("禁用状态")
+    private Boolean disabledFlag;
+
+    /**
+     * 删除状态
+     */
+    @DataTracerFieldLabel("删除状态")
+    private Boolean deletedFlag;
+
+    /**
+     * 创建人ID
+     */
+    private Long createUserId;
+
+    /**
+     * 创建人ID
+     */
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseCreateForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseCreateForm.java
@@ -0,0 +1,101 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.admin.module.business.oa.enterprise.constant.EnterpriseTypeEnum;
+import net.lab1024.sa.common.common.json.deserializer.FileKeyVoDeserializer;
+import net.lab1024.sa.common.common.json.serializer.FileKeyVoSerializer;
+import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
+import net.lab1024.sa.common.common.util.SmartVerificationUtil;
+import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+/**
+ * OA企业模块创建
+ *
+ * @Author 1024创新实验室: 开云
+ * @Date 2022/7/28 20:37:15
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class EnterpriseCreateForm {
+
+    @ApiModelProperty("企业名称")
+    @NotBlank(message = "企业名称不能为空")
+    @Length(max = 200, message = "企业名称最多200字符")
+    private String enterpriseName;
+
+    @ApiModelProperty("企业logo")
+    @JsonSerialize(using = FileKeyVoSerializer.class)
+    @JsonDeserialize(using = FileKeyVoDeserializer.class)
+    private String enterpriseLogo;
+
+    @ApiModelProperty("统一社会信用代码")
+    @NotBlank(message = "统一社会信用代码不能为空")
+    @Length(max = 200, message = "统一社会信用代码最多200字符")
+    private String unifiedSocialCreditCode;
+
+    @ApiModelProperty("联系人")
+    @NotBlank(message = "联系人不能为空")
+    @Length(max = 100, message = "联系人最多100字符")
+    private String contact;
+
+    @ApiModelProperty("联系人电话")
+    @NotBlank(message = "联系人电话不能为空")
+    @Pattern(regexp = SmartVerificationUtil.PHONE_REGEXP, message = "手机号格式不正确")
+    private String contactPhone;
+
+    @ApiModelPropertyEnum(desc = "类型", value = EnterpriseTypeEnum.class)
+    @CheckEnum(message = "类型不正确", value = EnterpriseTypeEnum.class)
+    private Integer type;
+
+    @ApiModelProperty("邮箱")
+    @Pattern(regexp = SmartVerificationUtil.EMAIL, message = "邮箱格式不正确")
+    private String email;
+
+    @ApiModelProperty("省份")
+    private Integer province;
+
+    @ApiModelProperty("省份名称")
+    private String provinceName;
+
+    @ApiModelProperty("城市")
+    private Integer city;
+
+    @ApiModelProperty("城市名称")
+    private String cityName;
+
+    @ApiModelProperty("区县")
+    private Integer district;
+
+    @ApiModelProperty("区县名称")
+    private String districtName;
+
+    @ApiModelProperty("详细地址")
+    @Length(max = 500, message = "详细地址最多500字符")
+    private String address;
+
+    @ApiModelProperty("营业执照")
+    @JsonSerialize(using = FileKeyVoSerializer.class)
+    @JsonDeserialize(using = FileKeyVoDeserializer.class)
+    private String businessLicense;
+
+    @ApiModelProperty("禁用状态")
+    @NotNull(message = "禁用状态不能为空")
+    private Boolean disabledFlag;
+
+    @ApiModelProperty(value = "创建人", hidden = true)
+    private Long createUserId;
+
+    @ApiModelProperty(value = "创建人", hidden = true)
+    private String createUserName;
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeForm.java
@@ -0,0 +1,29 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 企业员工
+ *
+ * @Author 1024创新实验室: 罗伊
+ * @Date 2022/7/28 20:37:15
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class EnterpriseEmployeeForm {
+
+    @ApiModelProperty("企业id")
+    @NotNull(message = "企业id不能为空")
+    private Long enterpriseId;
+
+    @ApiModelProperty("员工信息id")
+    @NotEmpty(message = "员工信息id不能为空")
+    private List<Long> employeeIdList;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeQueryForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeQueryForm.java
@@ -0,0 +1,35 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.common.common.domain.PageParam;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.List;
+
+/**
+ * 查询企业员工
+ *
+ * @Author 1024创新实验室: 开云
+ * @Date 2021-12-20 21:06:49
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ）
+ */
+@Data
+public class EnterpriseEmployeeQueryForm extends PageParam {
+
+    @ApiModelProperty("搜索词")
+    @Length(max = 20, message = "搜索词最多20字符")
+    private String keyword;
+
+    @ApiModelProperty("公司Id")
+    @NotNull(message = "公司id 不能为空")
+    private Long enterpriseId;
+
+    @ApiModelProperty(value = "删除标识", hidden = true)
+    private Boolean deletedFlag;
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseQueryForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseQueryForm.java
@@ -0,0 +1,38 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.common.common.domain.PageParam;
+import org.hibernate.validator.constraints.Length;
+
+import java.time.LocalDate;
+
+/**
+ * OA企业模块分页查询
+ *
+ * @Author 1024创新实验室: 开云
+ * @Date 2022/7/28 20:37:15
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class EnterpriseQueryForm extends PageParam {
+
+    @ApiModelProperty("关键字")
+    @Length(max = 200, message = "关键字最多200字符")
+    private String keywords;
+
+    @ApiModelProperty("开始时间")
+    private LocalDate startTime;
+
+    @ApiModelProperty("结束时间")
+    private LocalDate endTime;
+
+    @ApiModelProperty("禁用状态")
+    private Boolean disabledFlag;
+
+    @ApiModelProperty(value = "删除状态", hidden = true)
+    private Boolean deletedFlag;
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseUpdateForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseUpdateForm.java
@@ -0,0 +1,23 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise.domain.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * OA企业模块编辑
+ *
+ * @Author 1024创新实验室: 开云
+ * @Date 2022/7/28 20:37:15
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class EnterpriseUpdateForm extends EnterpriseCreateForm {
+
+    @ApiModelProperty("企业ID")
+    @NotNull(message = "企业ID不能为空")
+    private Long enterpriseId;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseEmployeeVO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseEmployeeVO.java
@@ -0,0 +1,47 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 企业员工信息
+ *
+ * @Author 1024创新实验室: 罗伊
+ * @Date 2022/7/28 20:37:15
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class EnterpriseEmployeeVO {
+
+    private Long enterpriseEmployeeId;
+
+    @ApiModelProperty("企业ID")
+    private Long enterpriseId;
+
+    @ApiModelProperty("企业名称")
+    private String enterpriseName;
+
+    @ApiModelProperty("员工")
+    private Long employeeId;
+
+    @ApiModelProperty("登录账号")
+    private String loginName;
+
+    @ApiModelProperty("员工名称")
+    private String actualName;
+
+    @ApiModelProperty("手机号码")
+    private String phone;
+
+    @ApiModelProperty("部门id")
+    private Long departmentId;
+
+    @ApiModelProperty("是否被禁用")
+    private Boolean disabledFlag;
+
+    @ApiModelProperty("部门名称")
+    private String departmentName;
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseListVO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseListVO.java
@@ -0,0 +1,20 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * OA企业模块列表
+ *
+ * @author lihaifan
+ * @date 2022/6/23 14:31
+ */
+@Data
+public class EnterpriseListVO {
+
+    @ApiModelProperty("企业ID")
+    private Long enterpriseId;
+
+    @ApiModelProperty("企业名称")
+    private String enterpriseName;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseVO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseVO.java
@@ -0,0 +1,89 @@
+package net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.admin.module.business.oa.enterprise.constant.EnterpriseTypeEnum;
+import net.lab1024.sa.common.common.json.serializer.FileKeyVoSerializer;
+import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
+
+import java.time.LocalDateTime;
+
+/**
+ * 企业信息
+ *
+ * @Author 1024创新实验室: 开云
+ * @Date 2022/7/28 20:37:15
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class EnterpriseVO {
+
+    @ApiModelProperty("企业ID")
+    private Long enterpriseId;
+
+    @ApiModelProperty("企业名称")
+    private String enterpriseName;
+
+    @ApiModelProperty("企业logo")
+    @JsonSerialize(using = FileKeyVoSerializer.class)
+    private String enterpriseLogo;
+
+    @ApiModelProperty("统一社会信用代码")
+    private String unifiedSocialCreditCode;
+
+    @ApiModelPropertyEnum(desc = "类型", value = EnterpriseTypeEnum.class)
+    private Integer type;
+
+    @ApiModelProperty("联系人")
+    private String contact;
+
+    @ApiModelProperty("联系人电话")
+    private String contactPhone;
+
+    @ApiModelProperty("邮箱")
+    private String email;
+
+    @ApiModelProperty("省份")
+    private Integer province;
+
+    @ApiModelProperty("省份名称")
+    private String provinceName;
+
+    @ApiModelProperty("城市")
+    private Integer city;
+
+    @ApiModelProperty("城市名称")
+    private String cityName;
+
+    @ApiModelProperty("区县")
+    private Integer district;
+
+    @ApiModelProperty("区县名称")
+    private String districtName;
+
+    @ApiModelProperty("详细地址")
+    private String address;
+
+    @ApiModelProperty("营业执照")
+    @JsonSerialize(using = FileKeyVoSerializer.class)
+    private String businessLicense;
+
+    @ApiModelProperty("禁用状态")
+    private Boolean disabledFlag;
+
+    @ApiModelProperty("创建人ID")
+    private Long createUserId;
+
+    @ApiModelProperty("创建人名称")
+    private String createUserName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java
@@ -0,0 +1,80 @@
+package net.lab1024.sa.admin.module.business.oa.invoice;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
+import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceAddForm;
+import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceQueryForm;
+import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceUpdateForm;
+import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceVO;
+import net.lab1024.sa.common.common.domain.PageResult;
+import net.lab1024.sa.common.common.domain.RequestUser;
+import net.lab1024.sa.common.common.domain.ResponseDTO;
+import net.lab1024.sa.common.common.util.SmartRequestUtil;
+import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * OA发票信息
+ *
+ * @Author 1024创新实验室: 善逸
+ * @Date 2022-06-23 19:32:59
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Slf4j
+@RestController
+@OperateLog
+@Api(tags = {AdminSwaggerTagConst.Business.OA_INVOICE})
+public class InvoiceController {
+
+    @Autowired
+    private InvoiceService invoiceService;
+
+    @ApiOperation(value = "分页查询发票信息 @author 善逸")
+    @PostMapping("/oa/invoice/page/query")
+    public ResponseDTO<PageResult<InvoiceVO>> queryByPage(@RequestBody @Valid InvoiceQueryForm queryDTO) {
+        return invoiceService.queryByPage(queryDTO);
+    }
+
+    @ApiOperation(value = "查询发票信息详情 @author 善逸")
+    @GetMapping("/oa/invoice/get/{invoiceId}")
+    public ResponseDTO<InvoiceVO> getDetail(@PathVariable Long invoiceId) {
+        return invoiceService.getDetail(invoiceId);
+    }
+
+    @ApiOperation(value = "新建发票信息 @author 善逸")
+    @PostMapping("/oa/invoice/create")
+    public ResponseDTO<String> createInvoice(@RequestBody @Valid InvoiceAddForm createVO) {
+        RequestUser requestUser = SmartRequestUtil.getRequestUser();
+        createVO.setCreateUserId(requestUser.getUserId());
+        createVO.setCreateUserName(requestUser.getUserName());
+        return invoiceService.createInvoice(createVO);
+    }
+
+    @ApiOperation(value = "编辑发票信息 @author 善逸")
+    @PostMapping("/oa/invoice/update")
+    public ResponseDTO<String> updateInvoice(@RequestBody @Valid InvoiceUpdateForm updateVO) {
+        return invoiceService.updateInvoice(updateVO);
+    }
+
+    @ApiOperation(value = "删除发票信息 @author 善逸")
+    @GetMapping("/invoice/delete/{invoiceId}")
+    public ResponseDTO<String> deleteInvoice(@PathVariable Long invoiceId) {
+        return invoiceService.deleteInvoice(invoiceId);
+    }
+
+    @ApiOperation(value = "查询列表 @author lidoudou")
+    @GetMapping("/oa/invoice/query/list/{enterpriseId}")
+    public ResponseDTO<List<InvoiceVO>> queryList(@PathVariable Long enterpriseId) {
+        return invoiceService.queryList(enterpriseId);
+    }
+
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceDao.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceDao.java
@@ -0,0 +1,61 @@
+package net.lab1024.sa.admin.module.business.oa.invoice;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceEntity;
+import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceQueryForm;
+import net.lab1024.sa.admin.module.business.oa.invoice.domain.InvoiceVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * OA发票信息
+ *
+ * @Author 1024创新实验室: 善逸
+ * @Date 2022-06-23 19:32:59
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Mapper
+@Component
+public interface InvoiceDao extends BaseMapper<InvoiceEntity> {
+
+    /**
+     * 根据账号查询
+     * @param enterpriseId
+     * @param accountNumber
+     * @param excludeInvoiceId
+     * @param deletedFlag
+     * @return
+     */
+    InvoiceEntity queryByAccountNumber(@Param("enterpriseId") Long enterpriseId, @Param("accountNumber") String accountNumber, @Param("excludeInvoiceId") Long excludeInvoiceId, @Param("deletedFlag") Boolean deletedFlag);
+
+    /**
+     * 删除发票信息
+     *
+     * @param invoiceId
+     * @param deletedFlag
+     */
+    void deleteInvoice(@Param("invoiceId") Long invoiceId, @Param("deletedFlag") Boolean deletedFlag);
+
+    /**
+     * 发票信息分页查询
+     *
+     * @param page
+     * @param queryForm
+     * @return
+     */
+    List<InvoiceVO> queryPage(Page page, @Param("queryForm") InvoiceQueryForm queryForm);
+
+    /**
+     * 查询发票信息详情
+     * @param invoiceId
+     * @param deletedFlag
+     * @return
+     */
+    InvoiceVO getDetail(@Param("invoiceId") Long invoiceId, @Param("deletedFlag") Boolean deletedFlag);
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java
@@ -0,0 +1,158 @@
+package net.lab1024.sa.admin.module.business.oa.invoice;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import net.lab1024.sa.admin.module.business.oa.enterprise.EnterpriseService;
+import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
+import net.lab1024.sa.admin.module.business.oa.invoice.domain.*;
+import net.lab1024.sa.common.common.domain.PageResult;
+import net.lab1024.sa.common.common.domain.ResponseDTO;
+import net.lab1024.sa.common.common.util.SmartBeanUtil;
+import net.lab1024.sa.common.common.util.SmartPageUtil;
+import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerConst;
+import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerTypeEnum;
+import net.lab1024.sa.common.module.support.datatracer.service.DataTracerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * OA发票信息
+ *
+ * @Author 1024创新实验室: 善逸
+ * @Date 2022-06-23 19:32:59
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Service
+@Slf4j
+public class InvoiceService {
+
+    @Autowired
+    private InvoiceDao invoiceDao;
+
+    @Autowired
+    private EnterpriseService enterpriseService;
+
+    @Autowired
+    private DataTracerService dataTracerService;
+
+    /**
+     * 分页查询发票信息
+     *
+     * @param queryDTO
+     * @return
+     */
+    public ResponseDTO<PageResult<InvoiceVO>> queryByPage(InvoiceQueryForm queryDTO) {
+        queryDTO.setDeletedFlag(Boolean.FALSE);
+        Page<?> page = SmartPageUtil.convert2PageQuery(queryDTO);
+        List<InvoiceVO> invoiceVOS = invoiceDao.queryPage(page, queryDTO);
+        PageResult<InvoiceVO> pageResult = SmartPageUtil.convert2PageResult(page, invoiceVOS);
+        return ResponseDTO.ok(pageResult);
+    }
+
+    public ResponseDTO<List<InvoiceVO>> queryList(Long enterpriseId) {
+        InvoiceQueryForm queryForm = new InvoiceQueryForm();
+        queryForm.setDeletedFlag(Boolean.FALSE);
+        queryForm.setDisabledFlag(Boolean.FALSE);
+        queryForm.setEnterpriseId(enterpriseId);
+        List<InvoiceVO> invoiceList = invoiceDao.queryPage(null, queryForm);
+        return ResponseDTO.ok(invoiceList);
+    }
+
+    /**
+     * 查询发票信息详情
+     *
+     * @param invoiceId
+     * @return
+     */
+    public ResponseDTO<InvoiceVO> getDetail(Long invoiceId) {
+        // 校验发票信息是否存在
+        InvoiceVO invoiceVO = invoiceDao.getDetail(invoiceId, Boolean.FALSE);
+        if (Objects.isNull(invoiceVO)) {
+            return ResponseDTO.userErrorParam("发票信息不存在");
+        }
+        return ResponseDTO.ok(invoiceVO);
+    }
+
+    /**
+     * 新建发票信息
+     *
+     * @param createVO
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseDTO<String> createInvoice(InvoiceAddForm createVO) {
+        Long enterpriseId = createVO.getEnterpriseId();
+        // 校验企业是否存在
+        EnterpriseVO enterpriseVO = enterpriseService.getDetail(enterpriseId);
+        if (Objects.isNull(enterpriseVO)) {
+            return ResponseDTO.userErrorParam("企业不存在");
+        }
+        // 验证发票信息账号是否重复
+        InvoiceEntity validateInvoice = invoiceDao.queryByAccountNumber(enterpriseId, createVO.getAccountNumber(), null, Boolean.FALSE);
+        if (Objects.nonNull(validateInvoice)) {
+            return ResponseDTO.userErrorParam("发票信息账号重复");
+        }
+        // 数据插入
+        InvoiceEntity insertInvoice = SmartBeanUtil.copy(createVO, InvoiceEntity.class);
+        invoiceDao.insert(insertInvoice);
+        dataTracerService.addTrace(enterpriseId, DataTracerTypeEnum.OA_ENTERPRISE, "新增发票：" + DataTracerConst.HTML_BR + dataTracerService.getChangeContent(insertInvoice));
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 编辑发票信息
+     *
+     * @param updateVO
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseDTO<String> updateInvoice(InvoiceUpdateForm updateVO) {
+        Long enterpriseId = updateVO.getEnterpriseId();
+        // 校验企业是否存在
+        EnterpriseVO enterpriseVO = enterpriseService.getDetail(enterpriseId);
+        if (Objects.isNull(enterpriseVO)) {
+            return ResponseDTO.userErrorParam("企业不存在");
+        }
+        Long invoiceId = updateVO.getInvoiceId();
+        // 校验发票信息是否存在
+        InvoiceEntity invoiceDetail = invoiceDao.selectById(invoiceId);
+        if (Objects.isNull(invoiceDetail) || invoiceDetail.getDeletedFlag()) {
+            return ResponseDTO.userErrorParam("发票信息不存在");
+        }
+        // 验证发票信息账号是否重复
+        InvoiceEntity validateInvoice = invoiceDao.queryByAccountNumber(updateVO.getEnterpriseId(), updateVO.getAccountNumber(), invoiceId, Boolean.FALSE);
+        if (Objects.nonNull(validateInvoice)) {
+            return ResponseDTO.userErrorParam("发票信息账号重复");
+        }
+        // 数据编辑
+        InvoiceEntity updateInvoice = SmartBeanUtil.copy(updateVO, InvoiceEntity.class);
+        invoiceDao.updateById(updateInvoice);
+        dataTracerService.addTrace(enterpriseId, DataTracerTypeEnum.OA_ENTERPRISE, "更新发票：" + DataTracerConst.HTML_BR + dataTracerService.getChangeContent(invoiceDetail, updateInvoice));
+        return ResponseDTO.ok();
+    }
+
+
+    /**
+     * 删除发票信息
+
+     * @param invoiceId
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseDTO<String> deleteInvoice(Long invoiceId) {
+        // 校验发票信息是否存在
+        InvoiceEntity invoiceDetail = invoiceDao.selectById(invoiceId);
+        if (Objects.isNull(invoiceDetail) || invoiceDetail.getDeletedFlag()) {
+            return ResponseDTO.userErrorParam("发票信息不存在");
+        }
+        invoiceDao.deleteInvoice(invoiceId, Boolean.TRUE);
+        dataTracerService.addTrace(invoiceDetail.getEnterpriseId(), DataTracerTypeEnum.OA_ENTERPRISE, "删除发票：" + DataTracerConst.HTML_BR + dataTracerService.getChangeContent(invoiceDetail));
+        return ResponseDTO.ok();
+    }
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceAddForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceAddForm.java
@@ -0,0 +1,59 @@
+package net.lab1024.sa.admin.module.business.oa.invoice.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * OA发票信息新建
+ *
+ * @Author 1024创新实验室: 善逸
+ * @Date 2022-06-23 19:32:59
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class InvoiceAddForm {
+
+    @ApiModelProperty("开票抬头")
+    @NotBlank(message = "开票抬头不能为空")
+    @Length(max = 200, message = "开票抬头最多200字符")
+    private String invoiceHeads;
+
+    @ApiModelProperty("纳税人识别号")
+    @NotBlank(message = "纳税人识别号不能为空")
+    @Length(max = 200, message = "纳税人识别号最多200字符")
+    private String taxpayerIdentificationNumber;
+
+    @ApiModelProperty("银行账户")
+    @NotBlank(message = "银行账户不能为空")
+    @Length(max = 200, message = "银行账户最多200字符")
+    private String accountNumber;
+
+    @ApiModelProperty("开户行")
+    @NotBlank(message = "开户行不能为空")
+    @Length(max = 200, message = "开户行最多200字符")
+    private String bankName;
+
+    @ApiModelProperty("启用状态")
+    @NotNull(message = "启用状态不能为空")
+    private Boolean disabledFlag;
+
+    @ApiModelProperty("备注")
+    @Length(max = 500, message = "备注最多500字符")
+    private String remark;
+
+    @ApiModelProperty("企业")
+    @NotNull(message = "企业不能为空")
+    private Long enterpriseId;
+
+    @ApiModelProperty(value = "创建人", hidden = true)
+    private Long createUserId;
+
+    @ApiModelProperty(value = "创建人名称", hidden = true)
+    private String createUserName;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceEntity.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceEntity.java
@@ -0,0 +1,98 @@
+package net.lab1024.sa.admin.module.business.oa.invoice.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import net.lab1024.sa.common.module.support.datatracer.annoation.DataTracerFieldLabel;
+
+import java.time.LocalDateTime;
+
+/**
+ * OA发票信息
+ *
+ * @Author 1024创新实验室: 善逸
+ * @Date 2022-06-23 19:32:59
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+@TableName("t_oa_invoice")
+public class InvoiceEntity {
+
+    /**
+     * 发票信息ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Long invoiceId;
+
+    /**
+     * 开票抬头
+     */
+    @DataTracerFieldLabel("开票抬头")
+    private String invoiceHeads;
+
+    /**
+     * 纳税人识别号
+     */
+    @DataTracerFieldLabel("纳税人识别号")
+    private String taxpayerIdentificationNumber;
+
+    /**
+     * 银行账户
+     */
+    @DataTracerFieldLabel("银行账户")
+    private String accountNumber;
+
+    /**
+     * 开户行
+     */
+    @DataTracerFieldLabel("开户行")
+    private String bankName;
+
+    /**
+     * 备注
+     */
+    @DataTracerFieldLabel("备注")
+    private String remark;
+
+    /**
+     * 企业ID
+     */
+    private Long enterpriseId;
+
+    /**
+     * 禁用状态
+     */
+    @DataTracerFieldLabel("禁用状态")
+    private Boolean disabledFlag;
+
+    /**
+     * 删除状态
+     */
+    @DataTracerFieldLabel("删除状态")
+    private Boolean deletedFlag;
+
+    /**
+     * 创建人ID
+     */
+    private Long createUserId;
+
+    /**
+     * 创建人ID
+     */
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceQueryForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceQueryForm.java
@@ -0,0 +1,40 @@
+package net.lab1024.sa.admin.module.business.oa.invoice.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.common.common.domain.PageParam;
+import org.hibernate.validator.constraints.Length;
+
+import java.time.LocalDate;
+
+/**
+ * OA发票信息查询
+ *
+ * @Author 1024创新实验室: 善逸
+ * @Date 2022-06-23 19:32:59
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class InvoiceQueryForm extends PageParam {
+
+    @ApiModelProperty("企业ID")
+    private Long enterpriseId;
+
+    @ApiModelProperty("关键字")
+    @Length(max = 200, message = "关键字最多200字符")
+    private String keywords;
+
+    @ApiModelProperty("开始时间")
+    private LocalDate startTime;
+
+    @ApiModelProperty("结束时间")
+    private LocalDate endTime;
+
+    @ApiModelProperty("禁用状态")
+    private Boolean disabledFlag;
+
+    @ApiModelProperty(value = "删除状态", hidden = true)
+    private Boolean deletedFlag;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceUpdateForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceUpdateForm.java
@@ -0,0 +1,23 @@
+package net.lab1024.sa.admin.module.business.oa.invoice.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * OA发票信息编辑
+ *
+ * @Author 1024创新实验室: 善逸
+ * @Date 2022-06-23 19:32:59
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class InvoiceUpdateForm extends InvoiceAddForm {
+
+    @ApiModelProperty("发票信息ID")
+    @NotNull(message = "发票信息ID不能为空")
+    private Long invoiceId;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceVO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceVO.java
@@ -0,0 +1,58 @@
+package net.lab1024.sa.admin.module.business.oa.invoice.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * OA发票信息
+ *
+ * @Author 1024创新实验室: 善逸
+ * @Date 2022-06-23 19:32:59
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class InvoiceVO {
+
+    @ApiModelProperty("发票信息ID")
+    private Long invoiceId;
+
+    @ApiModelProperty("开票抬头")
+    private String invoiceHeads;
+
+    @ApiModelProperty("纳税人识别号")
+    private String taxpayerIdentificationNumber;
+
+    @ApiModelProperty("银行账户")
+    private String accountNumber;
+
+    @ApiModelProperty("开户行")
+    private String bankName;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("企业")
+    private Long enterpriseId;
+
+    @ApiModelProperty("企业名称")
+    private String enterpriseName;
+
+    @ApiModelProperty("禁用状态")
+    private Boolean disabledFlag;
+
+    @ApiModelProperty("创建人ID")
+    private Long createUserId;
+
+    @ApiModelProperty("创建人名称")
+    private String createUserName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/constant/NoticeVisibleRangeDataTypeEnum.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/constant/NoticeVisibleRangeDataTypeEnum.java
@@ -0,0 +1,30 @@
+package net.lab1024.sa.admin.module.business.oa.notice.constant;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import net.lab1024.sa.common.common.enumeration.BaseEnum;
+
+/**
+ * 公告、通知 可见范围类型
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Getter
+@AllArgsConstructor
+public enum NoticeVisibleRangeDataTypeEnum implements BaseEnum {
+
+    EMPLOYEE(1, "员工"),
+
+    DEPARTMENT(2, "部门"),
+
+    ;
+
+    private final Integer value;
+
+    private final String desc;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java
@@ -0,0 +1,135 @@
+package net.lab1024.sa.admin.module.business.oa.notice.controller;
+
+import cn.hutool.extra.servlet.ServletUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.form.*;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.*;
+import net.lab1024.sa.admin.module.business.oa.notice.service.NoticeEmployeeService;
+import net.lab1024.sa.admin.module.business.oa.notice.service.NoticeService;
+import net.lab1024.sa.admin.module.business.oa.notice.service.NoticeTypeService;
+import net.lab1024.sa.common.common.annoation.SaAuth;
+import net.lab1024.sa.common.common.domain.PageResult;
+import net.lab1024.sa.common.common.domain.ResponseDTO;
+import net.lab1024.sa.common.common.util.SmartRequestUtil;
+import net.lab1024.sa.common.module.support.repeatsubmit.annoation.RepeatSubmit;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 公告、通知、新闻等等
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat 卓大1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Api(tags = AdminSwaggerTagConst.Business.OA_NOTICE)
+@RestController
+public class NoticeController {
+
+    @Autowired
+    private NoticeService noticeService;
+
+    @Autowired
+    private NoticeTypeService noticeTypeService;
+
+    @Autowired
+    private NoticeEmployeeService noticeEmployeeService;
+
+    // --------------------- 通知公告类型 -------------------------
+
+    @ApiOperation("通知公告类型-获取全部 @author 卓大")
+    @GetMapping("/oa/noticeType/getAll")
+    public ResponseDTO<List<NoticeTypeVO>> getAll() {
+        return ResponseDTO.ok(noticeTypeService.getAll());
+    }
+
+    @ApiOperation("通知公告类型-添加 @author 卓大")
+    @GetMapping("/oa/noticeType/add/{name}")
+    public ResponseDTO<String> add(@PathVariable String name) {
+        return noticeTypeService.add(name);
+    }
+
+    @ApiOperation("通知公告类型-修改 @author 卓大")
+    @GetMapping("/oa/noticeType/update/{noticeTypeId}/{name}")
+    public ResponseDTO<String> update(@PathVariable Long noticeTypeId, @PathVariable String name) {
+        return noticeTypeService.update(noticeTypeId, name);
+    }
+
+    @ApiOperation("通知公告类型-删除 @author 卓大")
+    @GetMapping("/oa/noticeType/delete/{noticeTypeId}")
+    public ResponseDTO<String> deleteNoticeType(@PathVariable Long noticeTypeId) {
+        return noticeTypeService.delete(noticeTypeId);
+    }
+
+    // --------------------- 【管理】通知公告-------------------------
+
+    @ApiOperation("【管理】通知公告-分页查询 @author 卓大")
+    @PostMapping("/oa/notice/query")
+    @SaAuth
+    public ResponseDTO<PageResult<NoticeVO>> query(@RequestBody @Valid NoticeQueryForm queryForm) {
+        return ResponseDTO.ok(noticeService.query(queryForm));
+    }
+
+    @ApiOperation("【管理】通知公告-添加 @author 卓大")
+    @PostMapping("/oa/notice/add")
+    @RepeatSubmit
+    @SaAuth
+    public ResponseDTO<String> add(@RequestBody @Valid NoticeAddForm addForm) {
+        addForm.setCreateUserId(SmartRequestUtil.getRequestUserId());
+        return noticeService.add(addForm);
+    }
+
+    @ApiOperation("【管理】通知公告-更新 @author 卓大")
+    @PostMapping("/oa/notice/update")
+    @RepeatSubmit
+    @SaAuth
+    public ResponseDTO<String> update(@RequestBody @Valid NoticeUpdateForm updateForm) {
+        return noticeService.update(updateForm);
+    }
+
+    @ApiOperation("【管理】通知公告-更新详情 @author 卓大")
+    @GetMapping("/oa/notice/getUpdateVO/{noticeId}")
+    @SaAuth
+    public ResponseDTO<NoticeUpdateFormVO> getUpdateFormVO(@PathVariable Long noticeId) {
+        return ResponseDTO.ok(noticeService.getUpdateFormVO(noticeId));
+    }
+
+    @ApiOperation("【管理】通知公告-删除 @author 卓大")
+    @GetMapping("/oa/notice/delete/{noticeId}")
+    @SaAuth
+    public ResponseDTO<String> delete(@PathVariable Long noticeId) {
+        return noticeService.delete(noticeId);
+    }
+
+    // --------------------- 【员工】查看 通知公告 -------------------------
+    @ApiOperation("【员工】通知公告-查看详情 @author 卓大")
+    @GetMapping("/oa/notice/employee/view/{noticeId}")
+    public ResponseDTO<NoticeDetailVO> view(@PathVariable Long noticeId, HttpServletRequest request) {
+        return noticeEmployeeService.view(
+                SmartRequestUtil.getRequestUserId(),
+                noticeId,
+                ServletUtil.getClientIP(request),
+                request.getHeader("User-Agent")
+        );
+    }
+
+    @ApiOperation("【员工】通知公告-查询全部 @author 卓大")
+    @PostMapping("/oa/notice/employee/query")
+    public ResponseDTO<PageResult<NoticeEmployeeVO>> queryEmployeeNotice(@RequestBody @Valid NoticeEmployeeQueryForm noticeEmployeeQueryForm) {
+        return noticeEmployeeService.queryList(SmartRequestUtil.getRequestUserId(), noticeEmployeeQueryForm);
+    }
+
+    @ApiOperation("【员工】通知公告-查询 查看记录 @author 卓大")
+    @PostMapping("/oa/notice/employee/queryViewRecord")
+    public ResponseDTO<PageResult<NoticeViewRecordVO>> queryViewRecord(@RequestBody @Valid NoticeViewRecordQueryForm noticeViewRecordQueryForm) {
+        return ResponseDTO.ok(noticeEmployeeService.queryViewRecord(noticeViewRecordQueryForm));
+    }
+}
--- 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
@@ -0,0 +1,144 @@
+package net.lab1024.sa.admin.module.business.oa.notice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeEntity;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeEmployeeQueryForm;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeQueryForm;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeViewRecordQueryForm;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeVisibleRangeForm;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeEmployeeVO;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVO;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeViewRecordVO;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVisibleRangeVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 公告、通知、新闻等等
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Mapper
+@Component
+public interface NoticeDao extends BaseMapper<NoticeEntity> {
+
+    // ================================= 数据范围相关 【子表】 =================================
+
+    /**
+     * 保存可见范围
+     *
+     * @param noticeId
+     * @param visibleRangeFormList
+     */
+    void insertVisibleRange(@Param("noticeId") Long noticeId, @Param("visibleRangeFormList") List<NoticeVisibleRangeForm> visibleRangeFormList);
+
+    /**
+     * 删除可见范围
+     *
+     * @param noticeId
+     */
+    void deleteVisibleRange(@Param("noticeId") Long noticeId);
+
+    /**
+     * 相关可见范围
+     *
+     * @param noticeId
+     */
+    List<NoticeVisibleRangeVO> queryVisibleRange(@Param("noticeId") Long noticeId);
+
+    // ================================= 通知公告【主表】 相关  =================================
+
+    /**
+     * 后管分页查询资讯
+     *
+     * @param page
+     * @param queryForm
+     * @return
+     */
+    List<NoticeVO> query(Page<?> page, @Param("query") NoticeQueryForm queryForm);
+
+
+    /**
+     * 更新删除状态
+     *
+     * @param noticeId
+     */
+    void updateDeletedFlag(@Param("noticeId") Long noticeId);
+
+    // ================================= 通知公告【员工查看】 相关  =================================
+
+    /**
+     * 查询 员工 查看到的通知公告
+     *
+     * @param page
+     * @param requestEmployeeId
+     * @param noticeEmployeeQueryForm
+     * @return
+     */
+    List<NoticeEmployeeVO> queryEmployeeNotice(Page<?> page,
+                                               @Param("requestEmployeeId") Long requestEmployeeId,
+                                               @Param("query") NoticeEmployeeQueryForm noticeEmployeeQueryForm,
+                                               @Param("requestEmployeeDepartmentIdList") List<Long> requestEmployeeDepartmentIdList,
+                                               @Param("deletedFlag") boolean deletedFlag,
+                                               @Param("administratorFlag") boolean administratorFlag,
+                                               @Param("departmentDataType") Integer departmentDataType,
+                                               @Param("employeeDataType") Integer employeeDataType
+
+    );
+
+    /**
+     * 查询 员工 未读的通知公告
+     *
+     * @param page
+     * @param requestEmployeeId
+     * @param noticeEmployeeQueryForm
+     * @return
+     */
+    List<NoticeEmployeeVO> queryEmployeeNotViewNotice(Page<?> page,
+                                               @Param("requestEmployeeId") Long requestEmployeeId,
+                                               @Param("query") NoticeEmployeeQueryForm noticeEmployeeQueryForm,
+                                               @Param("requestEmployeeDepartmentIdList") List<Long> requestEmployeeDepartmentIdList,
+                                               @Param("deletedFlag") boolean deletedFlag,
+                                               @Param("administratorFlag") boolean administratorFlag,
+                                               @Param("departmentDataType") Integer departmentDataType,
+                                               @Param("employeeDataType") Integer employeeDataType
+
+    );
+
+    long  viewRecordCount(@Param("noticeId")Long noticeId, @Param("employeeId")Long employeeId);
+
+    /**
+     * 查询通知、公告的 查看记录
+     * @param page
+     * @param noticeViewRecordQueryForm
+     * @return
+     */
+    List<NoticeViewRecordVO> queryNoticeViewRecordList(Page page,@Param("queryForm") NoticeViewRecordQueryForm noticeViewRecordQueryForm);
+
+    /**
+     * 保存查看记录
+     * @param noticeId
+     * @param employeeId
+     * @param ip
+     * @param userAgent
+     */
+    void insertViewRecord(@Param("noticeId") Long noticeId, @Param("employeeId") Long employeeId, @Param("ip") String ip, @Param("userAgent") String userAgent,@Param("pageViewCount") Integer pageViewCount);
+
+    /**
+     * 更新查看记录
+     * @param noticeId
+     * @param requestEmployeeId
+     * @param ip
+     * @param userAgent
+     */
+    void updateViewRecord(@Param("noticeId")Long noticeId, @Param("employeeId")Long requestEmployeeId,@Param("ip") String ip, @Param("userAgent")String userAgent);
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeTypeDao.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeTypeDao.java
@@ -0,0 +1,21 @@
+package net.lab1024.sa.admin.module.business.oa.notice.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeTypeEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * 通知公告类型
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Mapper
+@Component
+public interface NoticeTypeDao extends BaseMapper<NoticeTypeEntity> {
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/entity/NoticeEntity.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/entity/NoticeEntity.java
@@ -0,0 +1,99 @@
+package net.lab1024.sa.admin.module.business.oa.notice.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 通知公告
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+@TableName("t_notice")
+public class NoticeEntity {
+
+    @TableId(type = IdType.AUTO)
+    private Long noticeId;
+
+    /**
+     * 类型
+     */
+    private Long noticeTypeId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 是否全部可见
+     */
+    private Boolean allVisibleFlag;
+
+    /**
+     * 是否定时发布
+     */
+    private Boolean scheduledPublishFlag;
+
+    /**
+     * 发布时间
+     */
+    private LocalDateTime publishTime;
+
+    /**
+     * 内容 纯文本
+     */
+    private String contentText;
+
+    /**
+     * 内容 html
+     */
+    private String contentHtml;
+
+    /**
+     * 附件
+     * 多个英文逗号分隔
+     */
+    private String attachment;
+
+    /**
+     * 页面浏览量
+     */
+    private Integer pageViewCount;
+
+    /**
+     * 用户浏览量
+     */
+    private Integer userViewCount;
+
+    /**
+     * 来源
+     */
+    private String source;
+
+    /**
+     * 作者
+     */
+    private String author;
+
+    /**
+     * 文号
+     */
+    private String documentNumber;
+
+    private Boolean deletedFlag;
+
+    private Long createUserId;
+
+    private LocalDateTime updateTime;
+
+    private LocalDateTime createTime;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/entity/NoticeTypeEntity.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/entity/NoticeTypeEntity.java
@@ -0,0 +1,41 @@
+package net.lab1024.sa.admin.module.business.oa.notice.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * 通知公告类型
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+@TableName("t_notice_type")
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class NoticeTypeEntity {
+
+    @TableId(type = IdType.AUTO)
+    private Long noticeTypeId;
+
+    /**
+     * 名称
+     */
+    private String noticeTypeName;
+
+
+    private LocalDateTime updateTime;
+
+    private LocalDateTime createTime;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeAddForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeAddForm.java
@@ -0,0 +1,78 @@
+package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.common.common.json.deserializer.FileKeyVoDeserializer;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 通知公告 添加表单
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class NoticeAddForm {
+
+    @ApiModelProperty("标题")
+    @NotBlank(message = "标题不能为空")
+    @Length(max = 200, message = "标题最多200字符")
+    private String title;
+
+    @ApiModelProperty("分类")
+    @NotNull(message = "分类不能为空")
+    private Long noticeTypeId;
+
+    @ApiModelProperty("是否全部可见")
+    @NotNull(message = "是否全部可见不能为空")
+    private Boolean allVisibleFlag;
+
+    @ApiModelProperty("是否定时发布")
+    @NotNull(message = "是否定时发布不能为空")
+    private Boolean scheduledPublishFlag;
+
+    @ApiModelProperty("发布时间")
+    @NotNull(message = "发布时间不能为空")
+    private LocalDateTime publishTime;
+
+    @ApiModelProperty("纯文本内容")
+    @NotNull(message = "文本内容不能为空")
+    private String contentText;
+
+    @ApiModelProperty("html内容")
+    @NotNull(message = "html内容不能为空")
+    private String contentHtml;
+
+    @ApiModelProperty("附件,多个英文逗号分隔|可选")
+    @Length(max = 1000, message = "最多1000字符")
+    @JsonDeserialize(using = FileKeyVoDeserializer.class)
+    private String attachment;
+
+    @ApiModelProperty("作者")
+    @NotBlank(message = "作者不能为空")
+    private String author;
+
+    @ApiModelProperty("来源")
+    @NotBlank(message = "标题不能为空")
+    private String source;
+
+    @ApiModelProperty("文号")
+    private String documentNumber;
+
+    @ApiModelProperty(hidden = true)
+    private Long createUserId;
+
+    @ApiModelProperty("可见范围设置|可选")
+    @Valid
+    private List<NoticeVisibleRangeForm> visibleRangeList;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeEmployeeQueryForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeEmployeeQueryForm.java
@@ -0,0 +1,35 @@
+package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.common.common.domain.PageParam;
+
+import java.time.LocalDate;
+
+/**
+ * 通知公告 员工查询表单
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class NoticeEmployeeQueryForm extends PageParam {
+
+    @ApiModelProperty("标题、作者、来源、文号")
+    private String keywords;
+
+    @ApiModelProperty("分类")
+    private Long noticeTypeId;
+
+    @ApiModelProperty("发布-开始时间")
+    private LocalDate publishTimeBegin;
+
+    @ApiModelProperty("未读标识")
+    private Boolean notViewFlag;
+
+    @ApiModelProperty("发布-截止时间")
+    private LocalDate publishTimeEnd;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeQueryForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeQueryForm.java
@@ -0,0 +1,48 @@
+package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.common.common.domain.PageParam;
+
+import java.time.LocalDate;
+
+/**
+ * 通知公告 管理查询表单
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class NoticeQueryForm extends PageParam {
+
+    @ApiModelProperty("分类")
+    private Long noticeTypeId;
+
+    @ApiModelProperty("标题、作者、来源")
+    private String keywords;
+
+    @ApiModelProperty("文号")
+    private String documentNumber;
+
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+
+    @ApiModelProperty("删除标识")
+    private Boolean deletedFlag;
+
+    @ApiModelProperty("创建-开始时间")
+    private LocalDate createTimeBegin;
+
+    @ApiModelProperty("创建-截止时间")
+    private LocalDate createTimeEnd;
+
+    @ApiModelProperty("发布-开始时间")
+    private LocalDate publishTimeBegin;
+
+    @ApiModelProperty("发布-截止时间")
+    private LocalDate publishTimeEnd;
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeUpdateForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeUpdateForm.java
@@ -0,0 +1,24 @@
+package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 通知公告 更新表单
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class NoticeUpdateForm extends NoticeAddForm {
+
+    @ApiModelProperty("id")
+    @NotNull(message = "通知id不能为空")
+    private Long noticeId;
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeViewRecordQueryForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeViewRecordQueryForm.java
@@ -0,0 +1,32 @@
+package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.common.common.domain.PageParam;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 通知公告 阅读记录查询
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class NoticeViewRecordQueryForm extends PageParam {
+
+    @ApiModelProperty("通知公告id")
+    @NotNull(message = "通知公告id不能为空")
+    private Long noticeId;
+
+    @ApiModelProperty("部门id")
+    private Long departmentId;
+
+    @ApiModelProperty("关键字")
+    private String keywords;
+
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeVisibleRangeForm.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeVisibleRangeForm.java
@@ -0,0 +1,34 @@
+package net.lab1024.sa.admin.module.business.oa.notice.domain.form;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
+import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
+import net.lab1024.sa.common.common.validator.enumeration.CheckEnum;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 通知公告 可见范围数据
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class NoticeVisibleRangeForm {
+
+    @ApiModelPropertyEnum(NoticeVisibleRangeDataTypeEnum.class)
+    @CheckEnum(value = NoticeVisibleRangeDataTypeEnum.class, required = true, message = "数据类型错误")
+    private Integer dataType;
+
+    @ApiModelProperty("员工/部门id")
+    @NotNull(message = "员工/部门id不能为空")
+    private Long dataId;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeDetailVO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeDetailVO.java
@@ -0,0 +1,84 @@
+package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.common.common.json.serializer.FileKeyVoSerializer;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+/**
+ * 通知公告 详情
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class NoticeDetailVO {
+
+    @ApiModelProperty("id")
+    private Long noticeId;
+
+    @ApiModelProperty("标题")
+    private String title;
+
+    @ApiModelProperty("分类")
+    private Long noticeTypeId;
+
+    @ApiModelProperty("分类名称")
+    private Long noticeTypeName;
+
+    @ApiModelProperty("是否全部可见")
+    @NotNull(message = "是否全部可见不能为空")
+    private Boolean allVisibleFlag;
+
+    @ApiModelProperty("是否定时发布")
+    @NotNull(message = "是否定时发布不能为空")
+    private Boolean scheduledPublishFlag;
+
+    @ApiModelProperty("纯文本内容")
+    private String contentText;
+
+    @ApiModelProperty("html内容")
+    private String contentHtml;
+
+    @ApiModelProperty("附件")
+    @JsonSerialize(using = FileKeyVoSerializer.class)
+    private String attachment;
+
+    @ApiModelProperty("发布时间")
+    @NotNull(message = "发布时间不能为空")
+    private LocalDateTime publishTime;
+
+    @ApiModelProperty("作者")
+    @NotBlank(message = "作者不能为空")
+    private String author;
+
+    @ApiModelProperty("来源")
+    @NotBlank(message = "标题不能为空")
+    private String source;
+
+    @ApiModelProperty("文号")
+    private String documentNumber;
+
+    @ApiModelProperty("页面浏览量")
+    private Integer pageViewCount;
+
+    @ApiModelProperty("用户浏览量")
+    private Integer userViewCount;
+
+    @ApiModelProperty("创建人名称")
+    private Long createUserName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeEmployeeVO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeEmployeeVO.java
@@ -0,0 +1,26 @@
+package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * 通知公告 员工查看
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class NoticeEmployeeVO extends NoticeVO {
+
+    @ApiModelProperty("是否查看")
+    private Boolean viewFlag;
+
+    @ApiModelProperty("发布日期")
+    private LocalDate publishDate;
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeTypeVO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeTypeVO.java
@@ -0,0 +1,24 @@
+package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 通知公告 类型
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class NoticeTypeVO {
+
+    @ApiModelProperty("通知类型id")
+    private Long noticeTypeId;
+
+    @ApiModelProperty("通知类型-名称")
+    private String noticeTypeName;
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeUpdateFormVO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeUpdateFormVO.java
@@ -0,0 +1,35 @@
+package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.common.common.json.serializer.FileKeyVoSerializer;
+
+import java.util.List;
+
+/**
+ * 用于更新 【通知、公告】 的 VO 对象
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class NoticeUpdateFormVO extends NoticeVO {
+
+    @ApiModelProperty("纯文本内容")
+    private String contentText;
+
+    @ApiModelProperty("html内容")
+    private String contentHtml;
+
+    @ApiModelProperty("附件")
+    @JsonSerialize(using = FileKeyVoSerializer.class)
+    private String attachment;
+
+    @ApiModelProperty("可见范围")
+    private List<NoticeVisibleRangeVO> visibleRangeList;
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeVO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeVO.java
@@ -0,0 +1,75 @@
+package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDateTime;
+
+
+/**
+ * 新闻、公告  VO
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class NoticeVO {
+
+    @ApiModelProperty("id")
+    private Long noticeId;
+
+    @ApiModelProperty("标题")
+    private String title;
+
+    @ApiModelProperty("分类")
+    private Long noticeTypeId;
+
+    @ApiModelProperty("分类名称")
+    private String noticeTypeName;
+
+    @ApiModelProperty("是否全部可见")
+    private Boolean allVisibleFlag;
+
+    @ApiModelProperty("是否定时发布")
+    private Boolean scheduledPublishFlag;
+
+    @ApiModelProperty("发布状态")
+    private Boolean publishFlag;
+
+    @ApiModelProperty("发布时间")
+    private LocalDateTime publishTime;
+
+    @ApiModelProperty("作者")
+    @NotBlank(message = "作者不能为空")
+    private String author;
+
+    @ApiModelProperty("来源")
+    @NotBlank(message = "标题不能为空")
+    private String source;
+
+    @ApiModelProperty("文号")
+    private String documentNumber;
+
+    @ApiModelProperty("页面浏览量")
+    private Integer pageViewCount;
+
+    @ApiModelProperty("用户浏览量")
+    private Integer userViewCount;
+
+    @ApiModelProperty("删除标识")
+    private Boolean deletedFlag;
+
+    @ApiModelProperty("创建人名称")
+    private String createUserName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeViewRecordVO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeViewRecordVO.java
@@ -0,0 +1,49 @@
+package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 浏览记录 VO
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class NoticeViewRecordVO {
+
+    @ApiModelProperty("员工ID")
+    private Long employeeId;
+
+    @ApiModelProperty("员工姓名")
+    private String employeeName;
+
+    @ApiModelProperty("员工部门名称")
+    private String departmentName;
+
+    @ApiModelProperty("查看次数")
+    private Integer pageViewCount;
+
+    @ApiModelProperty("首次ip")
+    private String firstIp;
+
+    @ApiModelProperty("首次用户设备等标识")
+    private String firstUserAgent;
+
+    @ApiModelProperty("首次查看时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("最后一次 ip")
+    private String lastIp;
+
+    @ApiModelProperty("最后一次 用户设备等标识")
+    private String lastUserAgent;
+
+    @ApiModelProperty("最后一次查看时间")
+    private LocalDateTime updateTime;
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeVisibleRangeVO.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeVisibleRangeVO.java
@@ -0,0 +1,29 @@
+package net.lab1024.sa.admin.module.business.oa.notice.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
+import net.lab1024.sa.common.common.swagger.ApiModelPropertyEnum;
+
+/**
+ * 新闻、公告 可见范围数据 VO
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Data
+public class NoticeVisibleRangeVO {
+
+    @ApiModelPropertyEnum(NoticeVisibleRangeDataTypeEnum.class)
+    private Integer dataType;
+
+    @ApiModelProperty("员工/部门id")
+    private Long dataId;
+
+    @ApiModelProperty("员工/部门 名称")
+    private String dataName;
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/manager/NoticeManager.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/manager/NoticeManager.java
@@ -0,0 +1,67 @@
+package net.lab1024.sa.admin.module.business.oa.notice.manager;
+
+import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeEntity;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeVisibleRangeForm;
+import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerTypeEnum;
+import net.lab1024.sa.common.module.support.datatracer.service.DataTracerService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 通知、公告 manager
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Service
+public class NoticeManager {
+
+    @Autowired
+    private NoticeDao noticeDao;
+
+    @Autowired
+    private DataTracerService dataTracerService;
+
+    /**
+     * 保存
+     *
+     * @param noticeEntity
+     * @param visibleRangeFormList
+     */
+    @Transactional(rollbackFor = Throwable.class)
+    public void save(NoticeEntity noticeEntity, List<NoticeVisibleRangeForm> visibleRangeFormList) {
+        noticeDao.insert(noticeEntity);
+        Long noticeId = noticeEntity.getNoticeId();
+        // 保存可见范围
+        if (CollectionUtils.isNotEmpty(visibleRangeFormList)) {
+            noticeDao.insertVisibleRange(noticeId, visibleRangeFormList);
+        }
+        dataTracerService.insert(noticeId, DataTracerTypeEnum.OA_NOTICE);
+    }
+
+    /**
+     * 更新
+     *
+     * @param noticeEntity
+     * @param visibleRangeList
+     */
+    @Transactional(rollbackFor = Throwable.class)
+    public void update(NoticeEntity old, NoticeEntity noticeEntity, List<NoticeVisibleRangeForm> visibleRangeList) {
+        noticeDao.updateById(noticeEntity);
+        Long noticeId = noticeEntity.getNoticeId();
+        // 保存可见范围
+        if (CollectionUtils.isNotEmpty(visibleRangeList)) {
+            noticeDao.deleteVisibleRange(noticeId);
+            noticeDao.insertVisibleRange(noticeId, visibleRangeList);
+        }
+        dataTracerService.update(noticeId, DataTracerTypeEnum.OA_NOTICE, old, noticeEntity);
+    }
+}
--- 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
@@ -0,0 +1,159 @@
+package net.lab1024.sa.admin.module.business.oa.notice.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
+import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
+import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeEmployeeQueryForm;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeViewRecordQueryForm;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.*;
+import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
+import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
+import net.lab1024.sa.admin.module.system.employee.service.EmployeeService;
+import net.lab1024.sa.common.common.domain.PageResult;
+import net.lab1024.sa.common.common.domain.ResponseDTO;
+import net.lab1024.sa.common.common.util.SmartBeanUtil;
+import net.lab1024.sa.common.common.util.SmartPageUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+
+/**
+ * 员工查看 通知。公告
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Service
+public class NoticeEmployeeService {
+
+    @Autowired
+    private NoticeDao noticeDao;
+
+    @Autowired
+    private NoticeService noticeService;
+
+    @Autowired
+    private DepartmentService departmentService;
+
+    @Autowired
+    private EmployeeService employeeService;
+
+    /**
+     * 查询我的 通知、公告清单
+     *
+     * @return
+     */
+    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) {
+            employeeDepartmentIdList = departmentService.selfAndChildrenIdList(employeeEntity.getDepartmentId());
+        }
+
+        List<NoticeEmployeeVO> noticeList = null;
+        //只查询未读的
+        if (noticeEmployeeQueryForm.getNotViewFlag() != null && noticeEmployeeQueryForm.getNotViewFlag()) {
+            noticeList = noticeDao.queryEmployeeNotViewNotice(page,
+                    requestEmployeeId,
+                    noticeEmployeeQueryForm,
+                    employeeDepartmentIdList,
+                    false,
+                    employeeEntity.getAdministratorFlag(),
+                    NoticeVisibleRangeDataTypeEnum.DEPARTMENT.getValue(),
+                    NoticeVisibleRangeDataTypeEnum.EMPLOYEE.getValue());
+        } else {
+            // 查询全部
+            noticeList = noticeDao.queryEmployeeNotice(page,
+                    requestEmployeeId,
+                    noticeEmployeeQueryForm,
+                    employeeDepartmentIdList,
+                    false,
+                    employeeEntity.getAdministratorFlag(),
+                    NoticeVisibleRangeDataTypeEnum.DEPARTMENT.getValue(),
+                    NoticeVisibleRangeDataTypeEnum.EMPLOYEE.getValue());
+        }
+        // 设置发布日期
+        noticeList.forEach(notice -> notice.setPublishDate(notice.getPublishTime().toLocalDate()));
+
+        return ResponseDTO.ok(SmartPageUtil.convert2PageResult(page, noticeList));
+    }
+
+
+    /**
+     * 查询我的 待查看的 通知、公告清单
+     *
+     * @return
+     */
+    public ResponseDTO<NoticeDetailVO> view(Long requestEmployeeId, Long noticeId, String ip, String userAgent) {
+        NoticeUpdateFormVO updateFormVO = noticeService.getUpdateFormVO(noticeId);
+        if (updateFormVO == null || Boolean.TRUE.equals(updateFormVO.getDeletedFlag())) {
+            return ResponseDTO.userErrorParam("通知公告不存在");
+        }
+
+        EmployeeEntity employeeEntity = employeeService.getById(requestEmployeeId);
+        if (!updateFormVO.getAllVisibleFlag() && !checkVisibleRange(updateFormVO.getVisibleRangeList(), requestEmployeeId, employeeEntity.getDepartmentId())) {
+            return ResponseDTO.userErrorParam("对不起，您没有权限查看内容");
+        }
+
+        NoticeDetailVO noticeDetailVO = SmartBeanUtil.copy(updateFormVO, NoticeDetailVO.class);
+        long viewCount = noticeDao.viewRecordCount(noticeId, requestEmployeeId);
+        if (viewCount == 0) {
+            noticeDao.insertViewRecord(noticeId, requestEmployeeId, ip, userAgent, 1);
+        } else {
+            noticeDao.updateViewRecord(noticeId, requestEmployeeId, ip, userAgent);
+        }
+
+        return ResponseDTO.ok(noticeDetailVO);
+    }
+
+    /**
+     * 校验是否有查看权限的范围
+     *
+     * @param visibleRangeList
+     * @param employeeId
+     * @param departmentId
+     * @return
+     */
+    public boolean checkVisibleRange(List<NoticeVisibleRangeVO> visibleRangeList, Long employeeId, Long departmentId) {
+        // 员工范围
+        boolean anyMatch = visibleRangeList.stream().anyMatch(e -> NoticeVisibleRangeDataTypeEnum.EMPLOYEE.equalsValue(e.getDataType()) && Objects.equals(e.getDataId(), employeeId));
+        if (anyMatch) {
+            return true;
+        }
+
+        //部门范围
+        List<Long> visibleDepartmentIdList = visibleRangeList.stream().filter(e -> NoticeVisibleRangeDataTypeEnum.DEPARTMENT.equalsValue(e.getDataType()))
+                .map(NoticeVisibleRangeVO::getDataId).collect(Collectors.toList());
+
+        for (Long visibleDepartmentId : visibleDepartmentIdList) {
+            List<Long> departmentIdList = departmentService.selfAndChildrenIdList(visibleDepartmentId);
+            if (departmentIdList.contains(departmentId)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 分页查询  查看记录
+     *
+     * @param noticeViewRecordQueryForm
+     * @return
+     */
+    public PageResult<NoticeViewRecordVO> queryViewRecord(NoticeViewRecordQueryForm noticeViewRecordQueryForm) {
+        Page<?> page = SmartPageUtil.convert2PageQuery(noticeViewRecordQueryForm);
+        List<NoticeViewRecordVO> noticeViewRecordVOS = noticeDao.queryNoticeViewRecordList(page, noticeViewRecordQueryForm);
+        return SmartPageUtil.convert2PageResult(page, noticeViewRecordVOS);
+    }
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
@@ -0,0 +1,250 @@
+package net.lab1024.sa.admin.module.business.oa.notice.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import net.lab1024.sa.admin.module.business.oa.notice.constant.NoticeVisibleRangeDataTypeEnum;
+import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeEntity;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeAddForm;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeQueryForm;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeUpdateForm;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.form.NoticeVisibleRangeForm;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeTypeVO;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeUpdateFormVO;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVO;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVisibleRangeVO;
+import net.lab1024.sa.admin.module.business.oa.notice.manager.NoticeManager;
+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.department.domain.vo.DepartmentVO;
+import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
+import net.lab1024.sa.admin.module.system.employee.dao.EmployeeDao;
+import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
+import net.lab1024.sa.common.common.constant.StringConst;
+import net.lab1024.sa.common.common.domain.PageResult;
+import net.lab1024.sa.common.common.domain.ResponseDTO;
+import net.lab1024.sa.common.common.util.SmartBeanUtil;
+import net.lab1024.sa.common.common.util.SmartPageUtil;
+import net.lab1024.sa.common.module.support.datatracer.constant.DataTracerTypeEnum;
+import net.lab1024.sa.common.module.support.datatracer.service.DataTracerService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 通知。公告 后台管理业务
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Service
+public class NoticeService {
+
+    @Autowired
+    private NoticeDao noticeDao;
+
+    @Autowired
+    private NoticeManager noticeManager;
+
+    @Autowired
+    private EmployeeDao employeeDao;
+
+    @Autowired
+    private DepartmentDao departmentDao;
+
+    @Autowired
+    private DepartmentService departmentService;
+
+    @Autowired
+    private NoticeTypeService noticeTypeService;
+
+    @Autowired
+    private DataTracerService dataTracerService;
+
+    /**
+     * 查询 通知、公告
+     *
+     * @param queryForm
+     * @return
+     */
+    public PageResult<NoticeVO> query(NoticeQueryForm queryForm) {
+        Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
+        List<NoticeVO> list = noticeDao.query(page, queryForm);
+        LocalDateTime now = LocalDateTime.now();
+        list.forEach(e -> e.setPublishFlag(e.getPublishTime().isBefore(now)));
+        return SmartPageUtil.convert2PageResult(page, list);
+    }
+
+    /**
+     * 添加
+     *
+     * @param addForm
+     * @return
+     */
+    public ResponseDTO<String> add(NoticeAddForm addForm) {
+        // 校验并获取可见范围
+        ResponseDTO<String> validate = this.checkAndBuildVisibleRange(addForm);
+        if (!validate.getOk()) {
+            return ResponseDTO.error(validate);
+        }
+
+        // build 资讯
+        NoticeEntity noticeEntity = SmartBeanUtil.copy(addForm, NoticeEntity.class);
+        // 发布时间：不是定时发布时 默认为 当前
+        if (!addForm.getScheduledPublishFlag()) {
+            noticeEntity.setPublishTime(LocalDateTime.now());
+        }
+        // 保存数据
+        noticeManager.save(noticeEntity, addForm.getVisibleRangeList());
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 校验并返回可见范围
+     *
+     * @param form
+     * @return
+     */
+    private ResponseDTO<String> checkAndBuildVisibleRange(NoticeAddForm form) {
+        // 校验资讯分类
+        NoticeTypeVO noticeType = noticeTypeService.getByNoticeTypeId(form.getNoticeTypeId());
+        if (noticeType == null) {
+            return ResponseDTO.userErrorParam("分类不存在");
+        }
+
+        if (form.getAllVisibleFlag()) {
+            return ResponseDTO.ok();
+        }
+
+        /**
+         * 校验可见范围
+         * 非全部可见时 校验选择的员工|部门
+         */
+        List<NoticeVisibleRangeForm> visibleRangeUpdateList = form.getVisibleRangeList();
+        if (CollectionUtils.isEmpty(visibleRangeUpdateList)) {
+            return ResponseDTO.userErrorParam("未设置可见范围");
+        }
+
+        // 校验可见范围-> 员工
+        List<Long> employeeIdList = visibleRangeUpdateList.stream()
+                .filter(e -> NoticeVisibleRangeDataTypeEnum.EMPLOYEE.equalsValue(e.getDataType()))
+                .map(NoticeVisibleRangeForm::getDataId)
+                .distinct().collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(employeeIdList)) {
+            employeeIdList = employeeIdList.stream().distinct().collect(Collectors.toList());
+            List<Long> dbEmployeeIdList = employeeDao.selectBatchIds(employeeIdList).stream().map(EmployeeEntity::getEmployeeId).collect(Collectors.toList());
+            Collection<Long> subtract = CollectionUtils.subtract(employeeIdList, dbEmployeeIdList);
+            if (subtract.size() > 0) {
+                return ResponseDTO.userErrorParam("员工id不存在：" + subtract);
+            }
+        }
+
+        // 校验可见范围-> 部门
+        List<Long> deptIdList = visibleRangeUpdateList.stream()
+                .filter(e -> NoticeVisibleRangeDataTypeEnum.DEPARTMENT.equalsValue(e.getDataType()))
+                .map(NoticeVisibleRangeForm::getDataId)
+                .distinct().collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(deptIdList)) {
+            deptIdList = deptIdList.stream().distinct().collect(Collectors.toList());
+            List<Long> dbDeptIdList = departmentDao.selectBatchIds(deptIdList).stream().map(DepartmentEntity::getDepartmentId).collect(Collectors.toList());
+            Collection<Long> subtract = CollectionUtils.subtract(deptIdList, dbDeptIdList);
+            if (subtract.size() > 0) {
+                return ResponseDTO.userErrorParam("部门id不存在：" + subtract);
+            }
+        }
+        return ResponseDTO.ok();
+    }
+
+
+    /**
+     * 更新
+     *
+     * @param updateForm
+     * @return
+     */
+    public ResponseDTO<String> update(NoticeUpdateForm updateForm) {
+
+        NoticeEntity oldNoticeEntity = noticeDao.selectById(updateForm.getNoticeId());
+        if (oldNoticeEntity == null) {
+            return ResponseDTO.userErrorParam("通知不存在");
+        }
+
+        // 校验并获取可见范围
+        ResponseDTO<String> res = this.checkAndBuildVisibleRange(updateForm);
+        if (!res.getOk()) {
+            return ResponseDTO.error(res);
+        }
+
+        // 更新
+        NoticeEntity noticeEntity = SmartBeanUtil.copy(updateForm, NoticeEntity.class);
+        noticeManager.update(oldNoticeEntity, noticeEntity, updateForm.getVisibleRangeList());
+        return ResponseDTO.ok();
+    }
+
+
+    /**
+     * 删除
+     *
+     * @param noticeId
+     * @return
+     */
+    public ResponseDTO<String> delete(Long noticeId) {
+        NoticeEntity noticeEntity = noticeDao.selectById(noticeId);
+        if (null == noticeEntity || noticeEntity.getDeletedFlag()) {
+            return ResponseDTO.userErrorParam("通知公告不存在");
+        }
+        // 更新删除状态
+        noticeDao.updateDeletedFlag(noticeId);
+        dataTracerService.delete(noticeId, DataTracerTypeEnum.OA_NOTICE);
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 获取更新表单用的详情
+     *
+     * @param noticeId
+     * @return
+     */
+    public NoticeUpdateFormVO getUpdateFormVO(Long noticeId) {
+        NoticeEntity noticeEntity = noticeDao.selectById(noticeId);
+        if (null == noticeEntity) {
+            return null;
+        }
+
+        NoticeUpdateFormVO updateFormVO = SmartBeanUtil.copy(noticeEntity, NoticeUpdateFormVO.class);
+        if (!updateFormVO.getAllVisibleFlag()) {
+            List<NoticeVisibleRangeVO> noticeVisibleRangeList = noticeDao.queryVisibleRange(noticeId);
+            List<Long> employeeIdList = noticeVisibleRangeList.stream().filter(e -> NoticeVisibleRangeDataTypeEnum.EMPLOYEE.getValue().equals(e.getDataType()))
+                    .map(NoticeVisibleRangeVO::getDataId)
+                    .collect(Collectors.toList());
+
+            Map<Long, EmployeeEntity> employeeMap = null;
+            if (CollectionUtils.isNotEmpty(employeeIdList)) {
+                employeeMap = employeeDao.selectBatchIds(employeeIdList).stream().collect(Collectors.toMap(EmployeeEntity::getEmployeeId, Function.identity()));
+            } else {
+                employeeMap = new HashMap<>();
+            }
+            for (NoticeVisibleRangeVO noticeVisibleRange : noticeVisibleRangeList) {
+                if (noticeVisibleRange.getDataType().equals(NoticeVisibleRangeDataTypeEnum.EMPLOYEE.getValue())) {
+                    EmployeeEntity employeeEntity = employeeMap.get(noticeVisibleRange.getDataId());
+                    noticeVisibleRange.setDataName(employeeEntity == null ? StringConst.EMPTY : employeeEntity.getActualName());
+                } else {
+                    DepartmentVO departmentVO = departmentService.getDepartmentById(noticeVisibleRange.getDataId());
+                    noticeVisibleRange.setDataName(departmentVO == null ? StringConst.EMPTY : departmentVO.getName());
+                }
+            }
+            updateFormVO.setVisibleRangeList(noticeVisibleRangeList);
+        }
+        return updateFormVO;
+    }
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeTypeService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeTypeService.java
@@ -0,0 +1,87 @@
+package net.lab1024.sa.admin.module.business.oa.notice.service;
+
+import cn.hutool.core.util.StrUtil;
+import net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeTypeDao;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeTypeEntity;
+import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeTypeVO;
+import net.lab1024.sa.common.common.domain.ResponseDTO;
+import net.lab1024.sa.common.common.util.SmartBeanUtil;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * 通知。公告 类型
+ *
+ * @Author 1024创新实验室-主任: 卓大
+ * @Date 2022-08-12 21:40:39
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ），2012-2022
+ */
+@Service
+public class NoticeTypeService {
+
+    @Autowired
+    private NoticeTypeDao noticeTypeDao;
+
+    /**
+     * 查询全部
+     * @return
+     */
+    public List<NoticeTypeVO> getAll() {
+        return SmartBeanUtil.copyList(noticeTypeDao.selectList(null), NoticeTypeVO.class);
+    }
+
+    public NoticeTypeVO getByNoticeTypeId(Long noticceTypeId) {
+        return SmartBeanUtil.copy(noticeTypeDao.selectById(noticceTypeId), NoticeTypeVO.class);
+    }
+
+    public synchronized ResponseDTO<String> add(String name) {
+        if (StrUtil.isBlank(name)) {
+            return ResponseDTO.userErrorParam("类型名称不能为空");
+        }
+
+        List<NoticeTypeEntity> noticeTypeEntityList = noticeTypeDao.selectList(null);
+        if (!CollectionUtils.isEmpty(noticeTypeEntityList)) {
+            boolean exist = noticeTypeEntityList.stream().map(NoticeTypeEntity::getNoticeTypeName).collect(Collectors.toSet()).contains(name);
+            if (exist) {
+                return ResponseDTO.userErrorParam("类型名称已经存在");
+            }
+        }
+        noticeTypeDao.insert(NoticeTypeEntity.builder().noticeTypeName(name).build());
+        return ResponseDTO.ok();
+    }
+
+    public synchronized ResponseDTO<String> update(Long noticeTypeId, String name) {
+        if (StrUtil.isBlank(name)) {
+            return ResponseDTO.userErrorParam("类型名称不能为空");
+        }
+
+        NoticeTypeEntity noticeTypeEntity = noticeTypeDao.selectById(noticeTypeId);
+        if (noticeTypeEntity == null) {
+            return ResponseDTO.userErrorParam("类型名称不存在");
+        }
+
+        List<NoticeTypeEntity> noticeTypeEntityList = noticeTypeDao.selectList(null);
+        if (!CollectionUtils.isEmpty(noticeTypeEntityList)) {
+            Optional<NoticeTypeEntity> optionalNoticeTypeEntity = noticeTypeEntityList.stream().filter(e -> e.getNoticeTypeName().equals(name)).findFirst();
+            if (optionalNoticeTypeEntity.isPresent() && !optionalNoticeTypeEntity.get().getNoticeTypeId().equals(noticeTypeId)) {
+                return ResponseDTO.userErrorParam("类型名称已经存在");
+            }
+        }
+        noticeTypeEntity.setNoticeTypeName(name);
+        noticeTypeDao.updateById(noticeTypeEntity);
+        return ResponseDTO.ok();
+    }
+
+    public synchronized ResponseDTO<String> delete(Long noticeTypeId) {
+        noticeTypeDao.deleteById(noticeTypeId);
+        return ResponseDTO.ok();
+    }
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScope.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScope.java
@@ -0,0 +1,54 @@
+package net.lab1024.sa.admin.module.system.datascope;
+
+
+import net.lab1024.sa.admin.module.system.datascope.constant.DataScopeTypeEnum;
+import net.lab1024.sa.admin.module.system.datascope.constant.DataScopeWhereInTypeEnum;
+import net.lab1024.sa.admin.module.system.datascope.strategy.DataScopePowerStrategy;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 数据范围
+ *
+ * @Author 1024创新实验室: 罗伊
+ * @Date 2022-03-18 20:59:17
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ）
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface DataScope {
+
+    DataScopeTypeEnum dataScopeType() ;
+
+    DataScopeWhereInTypeEnum whereInType() default DataScopeWhereInTypeEnum.EMPLOYEE;
+
+    /**
+     * DataScopeWhereInTypeEnum.CUSTOM_STRATEGY类型 才可使用joinSqlImplClazz属性
+     * @return
+     */
+    Class<? extends DataScopePowerStrategy> joinSqlImplClazz()  default DataScopePowerStrategy.class;
+
+    /**
+     * 多个参数已逗号分隔，本属性主要用于joinSqlImplClazz 实现类跟进参数进行不同的范围控制，如不使用CUSTOM_STRATEGY，可不做配置
+     * @return
+     */
+    String paramName() default "";
+    /**
+     *
+     * 第几个where 条件 从0开始
+     * @return
+     */
+    int whereIndex() default 0;
+
+    /**
+     * DataScopeWhereInTypeEnum为CUSTOM_STRATEGY类型时，此属性无效
+     * @return
+     */
+    String joinSql() default "";
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java
@@ -0,0 +1,41 @@
+package net.lab1024.sa.admin.module.system.datascope;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import net.lab1024.sa.admin.common.AdminBaseController;
+import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
+import net.lab1024.sa.admin.module.system.datascope.domain.DataScopeAndViewTypeVO;
+import net.lab1024.sa.admin.module.system.datascope.service.DataScopeService;
+import net.lab1024.sa.common.common.domain.ResponseDTO;
+import net.lab1024.sa.common.module.support.operatelog.annoation.OperateLog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 查询支持的数据范围类型
+ *
+ * @Author 1024创新实验室: 罗伊
+ * @Date 2022-03-18 20:59:17
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ）
+ */
+@OperateLog
+@RestController
+@Api(tags = {AdminSwaggerTagConst.System.SYSTEM_DATA_SCOPE})
+public class DataScopeController extends AdminBaseController {
+
+    @Autowired
+    private DataScopeService dataScopeService;
+
+    @ApiOperation(value = "获取当前系统所配置的所有数据范围 @author 罗伊")
+    @GetMapping("/dataScope/list")
+    public ResponseDTO<List<DataScopeAndViewTypeVO>> dataScopeList() {
+        return dataScopeService.dataScopeList();
+    }
+
+
+}
--- a/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/MyBatisPlugin.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/com/gangquan360/smartadmin/module/datascope/MyBatisPlugin.java
@@ -1,49 +1,61 @@
-package com.gangquan360.smartadmin.module.datascope;
+package net.lab1024.sa.admin.module.system.datascope;

-import com.gangquan360.smartadmin.module.datascope.domain.dto.DataScopeSqlConfigDTO;
-import com.gangquan360.smartadmin.module.datascope.service.DataScopeSqlConfigService;
-import com.gangquan360.smartadmin.third.SmartApplicationContext;
-import com.gangquan360.smartadmin.util.SmartStringUtil;
+import cn.hutool.core.util.StrUtil;
+import com.google.common.collect.Maps;
+import net.lab1024.sa.admin.module.system.datascope.domain.DataScopeSqlConfig;
+import net.lab1024.sa.admin.module.system.datascope.service.DataScopeSqlConfigService;
+import net.lab1024.sa.common.common.domain.DataScopePlugin;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.plugin.Intercepts;
+import org.apache.ibatis.plugin.Invocation;
+import org.apache.ibatis.plugin.Plugin;
+import org.apache.ibatis.plugin.Signature;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;

 import java.util.List;
+import java.util.Map;
 import java.util.Properties;

 /**
- * [ mybaits sql 拦截 ]
+ * mybaits sql 拦截
 *
- * @author yandanyang
- * @version 1.0
- * @company 1024lab.net
- * @copyright (c) 2019 1024lab.netInc. All rights reserved.
- * @date
- * @since JDK1.8
+ * @Author 1024创新实验室: 罗伊
+ * @Date 2022-03-18 20:59:17
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ）
 */
@Intercepts({@Signature(type = org.apache.ibatis.executor.Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class})})
@Component
-public class MyBatisPlugin implements Interceptor {
+public class MyBatisPlugin extends DataScopePlugin {
+
+    @Autowired
+    private ApplicationContext applicationContext;

    @Override
    public Object intercept(Invocation invocation) throws Throwable {
+
        MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
        Object parameter = invocation.getArgs()[1];
+
        BoundSql boundSql = mappedStatement.getBoundSql(parameter);
        String originalSql = boundSql.getSql().trim();
        String id = mappedStatement.getId();
-        List<String> methodStrList = SmartStringUtil.splitConvertToList(id, "\\.");
+        List<String> methodStrList = StrUtil.split(id, ".");
        String path = methodStrList.get(methodStrList.size() - 2) + "." + methodStrList.get(methodStrList.size() - 1);
        DataScopeSqlConfigService dataScopeSqlConfigService = this.dataScopeSqlConfigService();
        if (dataScopeSqlConfigService == null) {
            return invocation.proceed();
        }
-        DataScopeSqlConfigDTO sqlConfigDTO = dataScopeSqlConfigService.getSqlConfig(path);
+        DataScopeSqlConfig sqlConfigDTO = dataScopeSqlConfigService.getSqlConfig(path);
        if (sqlConfigDTO != null) {
-            BoundSql newBoundSql = copyFromBoundSql(mappedStatement, boundSql, this.joinSql(originalSql, sqlConfigDTO));
+            Map<String, Object> paramMap = this.getParamList(sqlConfigDTO.getParamName(), parameter);
+            BoundSql newBoundSql = copyFromBoundSql(mappedStatement, boundSql, this.joinSql(originalSql, paramMap, sqlConfigDTO));
            ParameterMap map = mappedStatement.getParameterMap();
            MappedStatement newMs = copyFromMappedStatement(mappedStatement, new BoundSqlSqlSource(newBoundSql), map);
            invocation.getArgs()[0] = newMs;
@@ -53,11 +65,32 @@ public class MyBatisPlugin implements Interceptor {
        return obj;
    }

-    private String joinSql(String sql, DataScopeSqlConfigDTO sqlConfigDTO) {
+
+    private Map<String, Object> getParamList(String paramName, Object parameter) {
+        Map<String, Object> paramMap = Maps.newHashMap();
+        if (StringUtils.isEmpty(paramName)) {
+            return paramMap;
+        }
+        if (parameter == null) {
+            return paramMap;
+        }
+        if (parameter instanceof Map) {
+            String[] paramNameArray = paramName.split(",");
+            Map<?, ?> parameterMap = (Map) parameter;
+            for (String param : paramNameArray) {
+                if(parameterMap.containsKey(param)){
+                    paramMap.put(param, parameterMap.get(param));
+                }
+            }
+        }
+        return paramMap;
+    }
+
+    private String joinSql(String sql, Map<String, Object> paramMap, DataScopeSqlConfig sqlConfigDTO) {
        if (null == sqlConfigDTO) {
            return sql;
        }
-        String appendSql = this.dataScopeSqlConfigService().getJoinSql(sqlConfigDTO);
+        String appendSql = this.dataScopeSqlConfigService().getJoinSql(paramMap, sqlConfigDTO);
        if (StringUtils.isEmpty(appendSql)) {
            return sql;
        }
@@ -68,18 +101,18 @@ public class MyBatisPlugin implements Interceptor {
        int whereIndex = StringUtils.ordinalIndexOf(sql.toLowerCase(), where, appendSqlWhereIndex + 1);
        int orderIndex = sql.toLowerCase().indexOf(order);
        int groupIndex = sql.toLowerCase().indexOf(group);
-        if (whereIndex > - 1) {
+        if (whereIndex > -1) {
            String subSql = sql.substring(0, whereIndex + where.length() + 1);
            subSql = subSql + " " + appendSql + " AND " + sql.substring(whereIndex + where.length() + 1);
            return subSql;
        }

-        if (groupIndex > - 1) {
+        if (groupIndex > -1) {
            String subSql = sql.substring(0, groupIndex);
            subSql = subSql + " where " + appendSql + " " + sql.substring(groupIndex);
            return subSql;
        }
-        if (orderIndex > - 1) {
+        if (orderIndex > -1) {
            String subSql = sql.substring(0, orderIndex);
            subSql = subSql + " where " + appendSql + " " + sql.substring(orderIndex);
            return subSql;
@@ -89,7 +122,7 @@ public class MyBatisPlugin implements Interceptor {
    }

    public DataScopeSqlConfigService dataScopeSqlConfigService() {
-        return (DataScopeSqlConfigService) SmartApplicationContext.getBean("dataScopeSqlConfigService");
+        return (DataScopeSqlConfigService) applicationContext.getBean("dataScopeSqlConfigService");
    }

    public class BoundSqlSqlSource implements SqlSource {
@@ -99,6 +132,7 @@ public class MyBatisPlugin implements Interceptor {
        public BoundSqlSqlSource(BoundSql boundSql) {
            this.boundSql = boundSql;
        }
+
        @Override
        public BoundSql getBoundSql(Object parameterObject) {
            return boundSql;
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeTypeEnum.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeTypeEnum.java
@@ -0,0 +1,56 @@
+package net.lab1024.sa.admin.module.system.datascope.constant;
+
+import net.lab1024.sa.common.common.enumeration.BaseEnum;
+
+/**
+ * 数据范围 类型
+ *
+ * @Author 1024创新实验室: 罗伊
+ * @Date 2020/11/28  20:59:17
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ）
+ */
+public enum DataScopeTypeEnum implements BaseEnum {
+
+    /**
+     * 系统通知
+     */
+    NOTICE(1, 20, "系统通知", "系统通知数据范围"),
+    ;
+
+    private Integer value;
+
+    private Integer sort;
+
+    private String name;
+
+    private String desc;
+
+    DataScopeTypeEnum(Integer value, Integer sort, String name, String desc) {
+        this.value = value;
+        this.sort = sort;
+        this.name = name;
+        this.desc = desc;
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    @Override
+    public String getDesc() {
+        return desc;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeViewTypeEnum.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeViewTypeEnum.java
@@ -0,0 +1,53 @@
+package net.lab1024.sa.admin.module.system.datascope.constant;
+
+
+import net.lab1024.sa.common.common.enumeration.BaseEnum;
+
+
+/**
+ * 数据范围 种类
+ *
+ * @Author 1024创新实验室: 罗伊
+ * @Date 2020/11/28  20:59:17
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ）
+ */
+public enum DataScopeViewTypeEnum implements BaseEnum {
+
+    ME(0, 0, "本人"),
+
+    DEPARTMENT(1, 5, "本部门"),
+
+    DEPARTMENT_AND_SUB(2, 10, "本部门及下属子部门"),
+
+    ALL(10, 100, "全部");
+
+
+
+    private Integer value;
+    private Integer level;
+    private String desc;
+
+    DataScopeViewTypeEnum(Integer value, Integer level, String desc) {
+        this.value = value;
+        this.level = level;
+        this.desc = desc;
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    @Override
+    public String getDesc() {
+        return desc;
+    }
+
+
+}
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeWhereInTypeEnum.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeWhereInTypeEnum.java
@@ -0,0 +1,42 @@
+package net.lab1024.sa.admin.module.system.datascope.constant;
+
+
+import net.lab1024.sa.common.common.enumeration.BaseEnum;
+
+/**
+ * 数据范围 sql where
+ *
+ * @Author 1024创新实验室: 罗伊
+ * @Date 2020/11/28  20:59:17
+ * @Wechat zhuoda1024
+ * @Email lab1024@163.com
+ * @Copyright 1024创新实验室 （ https://1024lab.net ）
+ */
+public enum DataScopeWhereInTypeEnum implements BaseEnum {
+
+    EMPLOYEE(0, "以员工IN"),
+
+    DEPARTMENT(1, "以部门IN"),
+
+    CUSTOM_STRATEGY(2, "自定义策略");
+
+    private Integer value;
+    private String desc;
+
+    DataScopeWhereInTypeEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+    @Override
+    public String getDesc() {
+        return desc;
+    }
+
+
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
zhuoda	8dc663d885	【优化】代码格式优化	2023-07-26 21:23:41 +08:00
zhuoda	018bbf0993	恢复	2023-07-26 21:18:58 +08:00
zhuoda	25aad6ba5f	Revert "!22 sa-token" This reverts commit `e465fdbf0a`, reversing changes made to `c6d7ae9f46`.	2023-07-26 21:18:39 +08:00
1024创新实验室	e465fdbf0a	!22 sa-token Merge pull request !22 from Turbolisten/master	2023-07-26 12:11:31 +00:00
lixiaodong	1b6d8ac270	remove SaCheckPermission	2023-07-25 20:07:55 +08:00
lixiaodong	c9d4f12c64	sa-token update	2023-07-25 19:55:55 +08:00
lixiaodong	de3269b233	sa-token update	2023-07-25 19:54:52 +08:00
lixiaodong	0733919efc	sa-token update	2023-07-25 19:42:47 +08:00
lixiaodong	8a113bb7f8	sa-token update	2023-07-25 19:36:42 +08:00
lixiaodong	7de2627fee	sa-token update	2023-07-21 08:32:56 +08:00
lixiaodong	ac6921a278	sa-token	2023-07-13 20:15:41 +08:00
lixiaodong	54d8d9489a	sa-token	2023-07-13 18:54:48 +08:00
lixiaodong	0d17270b11	update system env	2023-07-12 22:58:04 +08:00
lixiaodong	1ad96b81e9	sa-token add login	2023-07-12 22:33:33 +08:00
lixiaodong	c894c3d934	add sa-token	2023-07-12 20:13:22 +08:00
zhuoda	c6d7ae9f46	Merge branch 'master' of https://gitee.com/lab1024/smart-admin	2023-06-13 20:34:15 +08:00
zhuoda	793115e2e7	update	2023-06-13 20:33:33 +08:00
kkaiyun	5a7cccbd26	update	2023-05-22 22:45:56 +08:00
卓大	08ded5b3fc	!21 update smart_admin_v2.sql. Merge pull request !21 from 桃花仙/N/A	2023-05-22 14:21:38 +00:00
卓大	c51d3a6181	!20 修改40X页面提示代码与错误提示内容不匹配 Merge pull request !20 from 霜叶/master	2023-05-22 14:21:09 +00:00
卓大	8683a1bcd6	!19 调整请求监控>请求详情请求内容的列宽 Merge pull request !19 from dd/vue-modify	2023-05-22 14:20:16 +00:00
卓大	40de7c1e32	!18 fix disableFlag 判断逻辑导致token 未移除 Merge pull request !18 from dd/master	2023-05-22 14:19:37 +00:00
桃花仙	05804c64f5	update smart_admin_v2.sql. 订正字段描述错误 Signed-off-by: 桃花仙 <36101995@qq.com>	2023-05-18 07:09:29 +00:00
霜叶	fdea2dd169	修改40X错误提示页面的错误，正确代码应为404对应页面未找到，403对应被禁止 Signed-off-by: 霜叶 <only_passerby@163.com>	2023-05-17 12:41:52 +00:00
peter zhang	f0f317ab53	调整请求监控>请求详情请求内容的列宽	2023-05-12 15:19:57 +08:00
peter zhang	29a67c6340	fix disableFlag 判断逻辑导致token 未移除	2023-05-12 14:58:14 +08:00
kkaiyun	3693856a05	Merge remote-tracking branch 'origin/master'	2023-05-10 20:09:42 +08:00
kkaiyun	05e91f7786	删除多余字符串	2023-05-10 20:09:36 +08:00
zhuoda	c7501c7f36	Merge branch 'master' of https://gitee.com/lab1024/smart-admin	2023-05-09 19:53:25 +08:00
zhuoda	6469ec4d4f	fix issus	2023-05-09 19:52:10 +08:00
kkaiyun	361b1fd60f	Merge branch 'master' of gitee.com:lab1024/smart-admin	2023-05-09 17:50:10 +08:00
kkaiyun	60757af3d7	更新代码生成参数	2023-05-09 17:49:55 +08:00
zhuoda	6665da07b7	优化一些问题和代码	2023-04-06 22:50:50 +08:00
zhuoda	28f4962e32	优化一些问题和代码	2023-04-06 22:50:18 +08:00
zhuoda	e2c6a83125	优化一些问题和代码	2023-04-06 22:48:07 +08:00
kkaiyun	f2d098d5d1	菜单树检索不生效	2023-03-04 14:27:02 +08:00
kkaiyun	fbd60b5881	菜单树检索不生效	2023-03-04 14:25:29 +08:00
1024创新实验室	5f16ab91d5	update README.md. Signed-off-by: 1024创新实验室 <1024lab@sina.com>	2023-02-17 00:50:35 +00:00
1024创新实验室	5673df549b	update smart-admin-web/javascript-ant-design-vue3/src/main.js. Signed-off-by: 1024创新实验室 <1024lab@sina.com>	2023-02-16 13:45:42 +00:00
卓大	d0885616b7	update README.md. 优化 Signed-off-by: 卓大 <zhuoluodada@qq.com>	2023-02-16 13:05:22 +00:00
zhuoda	588e055fc3	优化下文档	2023-02-16 21:00:01 +08:00
zhuoda	a5b40fabc9	优化下文档	2023-02-16 20:55:11 +08:00
zhuoda	613c033967	优化下文档	2023-02-16 20:53:57 +08:00
zhuoda	86b8c6849e	修复几个显示问题	2023-02-16 20:13:34 +08:00
zhuoda	521c89119f	修复几个显示问题	2023-02-16 20:11:43 +08:00
kkaiyun	f6651b8efe	天气显示不全	2023-02-09 22:06:20 +08:00
yandy_java	3e97448fd9	本地问题下载预览需要在系统参数里面配置访问路径我这边涉及文件的都是这个问题。默认路径： http://[ip:端口号]/preview/[文件key] 参考：net.lab1024.sa.common.config.MvcConfig#addResourceHandlers 这里配置。	2023-02-08 23:22:22 +08:00
yandy_java	77fac6149d	数据字典报错	2023-02-08 23:11:43 +08:00
zhuoda	3161675d40	修复字典第二页查询bug	2023-01-12 19:04:55 +08:00
zhuoda	4389441c2d	更新文档地址	2023-01-03 19:39:57 +08:00
zhuoda	2d6499b42d	修改标签页多次点击的问题	2022-12-16 18:37:42 +08:00
zhuoda	4d634887ba	添加代码规范	2022-12-09 18:48:01 +08:00
zhuoda	340dc1950c	v2.0 修改下登录提示语	2022-12-09 18:45:26 +08:00
zhuoda	cc590abc9e	Merge branch 'master' of https://gitee.com/lab1024/smart-admin	2022-12-09 18:39:41 +08:00
zhuoda	851f30a3b1	1、添加默认用户名和密码提示 2、打包prod环境添加依赖	2022-12-09 18:39:36 +08:00
yandy	6149ef9f0c	1.解决不需要security的项目是通过拦截器判断是否存在用户，此时common会自动引入security包 2.解决本地文件上传，图片找不到问题 3.添加UrlMatcherUtil，用于判断是否包含特定的URL	2022-11-25 09:46:16 +08:00
zhuoda	945e31290e	v2.0 更新vite3.2.3，速度非常快	2022-11-13 21:21:16 +08:00
zhuoda	5bd36cb42e	v2.0	2022-11-07 23:28:10 +08:00
zhuoda	01b7f93a9b	v2.0 优化下代码生成的提示	2022-11-07 23:27:02 +08:00
zhuoda	9631dbe008	v2.0	2022-11-06 22:10:44 +08:00
zhuoda	b811d79b34	时间范围选择增加默认选项	2022-11-06 22:09:46 +08:00
zhuoda	cd10a2d1b8	v2.0	2022-11-05 22:31:31 +08:00
zhuoda	2a2ccb4386	v2.0	2022-11-05 22:29:27 +08:00
zhuoda	06591c5a33	v2.0	2022-11-05 22:27:16 +08:00
zhuoda	a5e3271f56	v2.0	2022-11-05 22:03:50 +08:00
zhuoda	ff88bbcb6a	v2.0	2022-11-05 11:40:51 +08:00
zhuoda	188843517d	v2.0	2022-11-05 11:39:44 +08:00
卓大	79fb81ca38	update README.md. Signed-off-by: 卓大 <zhuoluodada@qq.com>	2022-11-05 03:38:54 +00:00
卓大	70747bf1de	update README.md. Signed-off-by: 卓大 <zhuoluodada@qq.com>	2022-11-05 03:37:27 +00:00
zhuoda	9ee69b7889	v2.0	2022-11-05 11:36:25 +08:00
zhuoda	45f0a50344	v2.0	2022-11-05 11:33:49 +08:00
zhuoda	c54716808d	v2.0	2022-10-29 08:59:31 +08:00
zhuoda	0fefed6da1	v2.0	2022-10-28 21:43:48 +08:00
zhuoda	f6971fa7c0	v2.0 代码提交	2022-10-27 22:38:31 +08:00
zhuoda	c42e24ccf8	v2.0 代码提交	2022-10-27 22:36:43 +08:00
zhuoda	98df0f5e6a	v2.0 代码提交	2022-10-27 22:33:46 +08:00
zhuoda	7f2099d507	v2.0 代码提交	2022-10-27 22:31:26 +08:00
zhuoda	fe58e61814	v2.0 代码提交	2022-10-27 22:28:52 +08:00
zhuoda	8d42c5730d	Merge branch 'master' of https://gitee.com/lab1024/smart-admin	2022-10-27 22:15:20 +08:00
zhuoda	f7e5f6d539	v2.0 代码提交	2022-10-27 22:14:48 +08:00
zhuoda	a8cefcc310	update smart-admin-api/sa-parent/pom.xml. Signed-off-by: user_5589720 <zhuoluodada@qq.com>	2022-10-24 12:32:30 +00:00
zhuoda	207b949484	vue3的js和ts代码上传	2022-10-24 20:11:58 +08:00
zhuoda	0996e90df0	修改下目录结构	2022-10-24 20:10:37 +08:00
zhuoda	692ab99e0c	Merge branch 'master' of https://gitee.com/lab1024/smart-admin	2022-10-24 19:47:54 +08:00
zhuoda	51ce05b761	上传 v2.0.0 的typescript代码	2022-10-24 19:46:34 +08:00
zhuoda	f0c5369e36	v2.0.0	2022-10-24 19:42:11 +08:00
zhuoda	58ad4f12b8	上传typescript版本代码，但是ts很多警告还没解决	2022-10-24 19:39:27 +08:00
zhuoda	2621703f1f	2.0的js版本和后端完成	2022-10-22 20:49:25 +08:00
zhuoda	b782b953a5	update README.md.	2022-04-26 05:38:58 +00:00
zhuoda	4fc2976624	update	2021-09-13 14:36:17 +00:00
lipeng	c692d0e6d3	增加缺失依赖	2021-08-10 13:13:17 +08:00
zhuoda	1204787cf3	update 代码规范/api接口规范.md.	2021-05-19 10:48:01 +08:00
zhuoda	2d61c21398	update 代码规范/api接口规范.md.	2021-05-19 10:47:44 +08:00
zhuoda	fe6ab3798a	update 代码规范/api接口规范.md.	2021-05-19 10:47:36 +08:00
zhuoda	0c0da77ecd	更新api接口规范	2021-05-19 10:46:37 +08:00
zhuoda	c530d8db15	add 代码规范/api接口规范.md.	2021-05-19 10:39:04 +08:00
zhuoda	a1357155b9	去掉引导和修改默认登录账号	2021-05-02 10:15:25 +08:00
zhuoda	b072b9e758	update README.md.	2021-04-16 22:48:51 +08:00
zhuoda	355643ce86	update README.md.	2021-04-15 22:33:50 +08:00
1024-lab	5e43679c3c	update README.md.	2021-03-05 21:03:14 +08:00
1024-lab	5249c2fdf5	update README.md.	2021-03-05 21:02:18 +08:00
1024-lab	8fc8338bfa	update README.md.	2021-03-05 08:56:10 +08:00
yandy_java	111d930f98	!6 修复同电话员工校验 Merge pull request !6 from Anonym/master	2021-01-18 21:55:43 +08:00
yandy_java	835076c301	!7 bug修复及优化 Merge pull request !7 from Turbolisten/master	2021-01-18 21:54:47 +08:00
zhuoda	02560ea621	package lock	2021-01-11 21:24:50 +08:00
zhuoda	606e763126	优化h5项目	2021-01-10 20:21:30 +08:00
Turbolisten	21cd668943	修改数据库字符编码统一为utf8mb4_unicode_ci	2021-01-09 10:22:21 +08:00
Turbolisten	ea0159ddb4	优化枚举类校验;优化Swagger配置,添加默认参数;fix删除部门;优化ResponseDTO;	2021-01-09 10:13:15 +08:00
Turbolisten	f7155ac4c2	Merge remote-tracking branch 'origin/master'	2021-01-09 09:05:03 +08:00
Turbolisten	063190c314	update .gitignore	2021-01-08 22:01:36 +08:00
zhuoda	7e580440f0	v1.10.0	2020-12-14 15:56:25 +08:00
zhuoda	653f4c2d6c	fix code	2020-12-14 14:10:27 +08:00
李宗亮	46645e5696	修复同电话员工校验	2020-12-09 11:20:01 +08:00
1024-lab	0ba522632b	update README.md.	2020-12-08 18:11:52 +08:00
1024-lab	56df084e57	update README.md.	2020-12-08 18:05:40 +08:00
1024-lab	29789e2b3f	update README.md.	2020-12-08 18:05:10 +08:00
zhuoda	49da08dfc1	smart-admin-h5	2020-11-29 23:35:57 +08:00
zhuoda	fb33580397	!5 smartadmin问题修改 Merge pull request !5 from yandy_java/master	2020-11-29 22:39:45 +08:00
yandy_java	b03a911ba9	Merge branch 'master' of gitee.com:lab1024/smart-admin into master	2020-11-29 22:32:49 +08:00
1024-lab	80bee09d3e	!4 EmployeeMapper.xml动态平台修改 Merge pull request !4 from gaoshun/master	2020-11-29 21:56:46 +08:00
yandanyang	fa21afa5ba	employee bug修改	2020-11-28 23:10:34 +08:00
yandanyang	01fe8a7c16	1.修改quartz问题。2完善数据范围添加策略支持。3修改swaggerbug。4取消验证码	2020-11-28 23:02:08 +08:00
Turbolisten	701d95653e	优化枚举类校验;Decimal工具类增加max,min	2020-10-24 09:59:13 +08:00
gaoshun	3b1603aceb	git commit getEmployeeByIds 拼接sql括号添加	2020-10-16 17:44:35 +08:00
gaoshun	72118743ef	git commit getEmployeeIdByDeptIds括号添加	2020-10-16 17:42:40 +08:00
gaoshun	58113847f4	git commit 方法close open闭合括号修改	2020-10-16 17:41:06 +08:00
zhuoda	70173ebd22	v1.2.1	2020-09-22 09:33:56 +08:00
1024-lab	8f32765f44	!2 update smart-admin-web/src/views/login/login.less. Merge pull request !2 from 葉者/N/A	2020-09-21 21:49:46 +08:00
1024-lab	291674d3a9	!3 【轻量更新修复】修改单词错误;修改PageUtil工具类等等 Merge pull request !3 from Turbolisten/master	2020-09-21 21:48:58 +08:00
Turbolisten	2a72e341e6	还原date	2020-09-18 17:41:01 +08:00
Turbolisten	68015d3e7f	更新枚举类swagger注解ApiModelPropertyEnum -增加是否隐藏属性hidden默认展示	2020-09-18 17:35:41 +08:00
葉者	418e2064a5	update smart-admin-web/src/views/login/login.less. 登陆面板圆角样式处理	2020-09-10 17:22:03 +08:00
Turbolisten	3e95e29b15	修改单词错误;修改Date为LocalDateTime;修改PageUtil工具类;添加.gitignore;	2020-09-07 18:30:26 +08:00
zhuo	486cc02088	v1.2.0	2020-09-06 17:42:14 +08:00
1024-lab	029d9b0ef0	去掉qq群	2020-05-26 08:23:50 +08:00
zhuoda	6c0fbbc7c4	v1.1.0	2020-04-20 17:10:24 +08:00
zhuoda	e486c1ff33	v1.1.0	2020-04-20 17:08:42 +08:00
1024-lab	0646df4d8e	v1.1.0	2020-04-08 20:58:59 +08:00
zhuoda	d53f271fc1	v1.1.0	2020-04-08 20:44:29 +08:00
zhuoda	1a42250f2f	v1.1.0	2020-04-08 20:43:08 +08:00
zhuoda	8d70747f59	v1.1.0	2020-04-08 20:32:02 +08:00
zhuoda	e540cd75cc	v1.1.0	2020-04-08 20:30:05 +08:00
zhuoda	a34f5d5afa	v1.1.0	2020-04-08 20:15:01 +08:00
zhuoda	8394525697	v1.1.0	2020-04-07 22:10:57 +08:00
1024-lab	741a00289a	update README.md.	2020-03-25 21:57:04 +08:00
1024-lab	4d745decf3	update README.md.	2020-03-25 21:56:38 +08:00
zhuokongming	a6d3ace808	v1.0.9	2020-03-19 14:05:42 +08:00