Merge pull request #5692 from hoperunChen/fix-QQYUN-7527

fix QQYUN-7527 vue3代码生成默认带上高级查询
Merge pull request #5691 from hoperunChen/Fix-QQYUN-7583
2025-12-08 17:12:28 +08:00 · 2023-12-26 14:35:56 +08:00 · 2023-12-26 14:00:59 +08:00 · 2023-12-26 13:59:52 +08:00 · 2023-12-23 19:24:15 +08:00 · 2023-12-21 15:47:28 +08:00
86 changed files with 5077 additions and 3667 deletions
--- a/README-EN.md
+++ b/README-EN.md
@ -7,13 +7,13 @@
 JEECG BOOT Low Code Development Platform
 ===============

-当前最新版本： 3.6.0（发布日期：2023-10-23） 
+当前最新版本： 3.6.1（发布日期：2023-12-11） 


 [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
 [![](https://img.shields.io/badge/Author-guojusoft-orange.svg)](http://www.jeecg.com)
 [![](https://img.shields.io/badge/Blog-blog-blue.svg)](https://jeecg.blog.csdn.net)
-[![](https://img.shields.io/badge/version-3.6.0-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
+[![](https://img.shields.io/badge/version-3.6.1-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot)

@ -58,13 +58,12 @@ Download the source code
 | `jeecg-boot`    | SpringBoot background source code (support microservices)      |
 | `jeecgboot-vue3` | Vue3+TS new front-end source code|
 | `jeecg-uniapp` | [APP development framework, a code multi terminal adaptation, and support APP, small program, H5](https://github.com/jeecgboot/jeecg-uniapp) |
-| `jeecg-boot-starter` | [Stater relies on the project to be maintained separately. Click Download](https://gitee.com/jeecg/jeecg-boot-starter) |
+| `SpringBoot3+JDK17`    | [BranchSourceCode](https://github.com/jeecgboot/jeecg-boot/tree/springboot3)  [UpgradeBlog](https://blog.csdn.net/zhangdaiscott/article/details/134805602)        |
 | `More` | [Download more source code](http://jeecg.com/download) |




-
 For the project
 -----------------------------------
 Jeecg-Boot low code development platform can be applied in the development of any J2EE project, especially for SAAS projects, enterprise information management system (MIS), internal office system (OA), enterprise resource planning system (ERP), customer relationship management system (CRM), etc. Its semi-intelligent manual Merge development method, Can significantly improve the development efficiency of more than 70%, greatly reduce the development cost.
@ -88,12 +87,17 @@ Technical documentation
 - Doc：  [http://help.jeecg.com](http://help.jeecg.com)
 - Newbie guide： [Quick start](http://www.jeecg.com/doc/quickstart)  |  [video](https://space.bilibili.com/454617261/channel/series) |   [Q&A ](http://www.jeecg.com/doc/qa)  |   [help](http://jeecg.com/doc/help) |  [1 minute experience](https://my.oschina.net/jeecg/blog/3083313)
 - Microservice Development：  [Monomer upgrade to microservice](https://help.jeecg.com/java/springcloud/switchcloud/monomer.html)
- QQ group ： ⑦791696430、⑥730954414、683903138、⑤860162132(full)、④774126647(full)、③816531124(full)、②769925425(full)、①284271917(full)
+- QQ group ： ⑧825232878、⑦791696430、⑥730954414(full)、683903138(full)、⑤860162132(full)、④774126647(full)、③816531124(full)、②769925425(full)、①284271917(full)
 - Demo ： [Vue3](http://boot3.jeecg.com) | [Vue2](http://boot.jeecg.com)  | [APP](http://jeecg.com/appIndex)
 > [please click obtain account password to obtain](http://jeecg.com/doc/demo) 



+Thinking
+-----------------------------------
+> We are pursuing the goal of implementing complex business systems without writing code! That has been done so far
+- https://www.qiaoqiaoyun.com
+

 Star charts
 -----------------------------------
--- a/README.md
+++ b/README.md
@ -7,13 +7,13 @@
 JEECG BOOT 低代码开发平台
 ===============

-当前最新版本： 3.6.0（发布日期：2023-10-23） 
+当前最新版本： 3.6.1（发布日期：2023-12-11） 


 [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
 [![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://jeecg.com/aboutusIndex)
 [![](https://img.shields.io/badge/Blog-官方博客-blue.svg)](https://jeecg.blog.csdn.net)
-[![](https://img.shields.io/badge/version-3.6.0-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
+[![](https://img.shields.io/badge/version-3.6.1-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot)

@ -49,16 +49,17 @@ Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中，
 | Github | [jeecgboot-vue3](https://github.com/jeecgboot/jeecgboot-vue3)   | [jeecg-boot](https://github.com/jeecgboot/jeecg-boot) |
 | 码云 | [jeecgboot-vue3](https://gitee.com/jeecg/jeecgboot-vue3)   | [jeecg-boot](https://gitee.com/jeecg/jeecg-boot) |

+> 官方已推出 `SpringBoot3+JDK17版本` [分支源码下载](https://github.com/jeecgboot/jeecg-boot/tree/springboot3)  |  [升级SpringBoot3博客](https://blog.csdn.net/zhangdaiscott/article/details/134805602)

 #### 项目说明

 | 项目名                | 说明                     | 
 |--------------------|------------------------|
-| `jeecg-boot`    | JAVA后台源码（支持微服务）        |
 | `jeecgboot-vue3` | 前端源码 (Vue3版本) |
+| `jeecg-boot`    | 后端JAVA源码（支持微服务）        |
 | `jeecg-uniapp` | [APP开发框架，一份代码多终端适配，同时支持APP、小程序、H5](https://github.com/jeecgboot/jeecg-uniapp) |
-| `jeecg-boot-starter` | [Stater依赖项目单独维护，点击下载](https://gitee.com/jeecg/jeecg-boot-starter) |
-| `更多开源项目` | [更多源码下载](http://jeecg.com/download) |
+| `更多开源项目` | [更多底层源码下载](http://jeecg.com/download) |
+


 快速搭建开发环境
@ -88,10 +89,16 @@ Docker快速启动项目
 - 在线演示 ：  [Vue3演示](http://boot3.jeecg.com)   | [APP演示](http://jeecg.com/appIndex) |  [敲敲云零代码](https://qiaoqiaoyun.com)
 > 演示系统的登录账号密码，请点击 [获取账号密码](http://jeecg.com/doc/demo) 获取 
 >
- QQ交流群 ： ⑦791696430、⑥730954414、VUE3群683903138、⑤860162132(满)、④774126647(满)、③816531124(满)、②769925425(满)、①284271917(满)
+- QQ交流群 ： ⑧825232878、⑦791696430(满)、⑥730954414(满)、683903138(满)、⑤860162132(满)、④774126647(满)、③816531124(满)、②769925425(满)、①284271917(满)
 > ` 提醒：【QQ群是自助服务群，建议给帮助您解决问题的同学发送指定红包，表示感谢！】 `


+大龄码农的思考
+-----------------------------------
+> 作为码农年纪大了写不动代码了怎么办？？哎！！
+所以我们团队在追求不写代码也可实现复杂业务系统！目前已经做到了，不信你到敲敲云零代码试试（通过流程串联修改业务数据）
+
+- https://www.qiaoqiaoyun.com


 技术支持
@ -104,8 +111,6 @@ Docker快速启动项目



-
-
 VUE2版本专题介绍
 -----------------------------------
 #### 项目介绍 
@ -462,8 +467,11 @@ Star走势图
   
 ```

+### 流程引擎推荐

+JeecgBoot企业版本默认集成了activiti和flowable两套方案，大家在使用本开源项目时，如果想进一步集成流程引擎，推荐结合贺波老师的书 [《深入Activiti流程引擎：核心原理与高阶实战》](https://item.m.jd.com/product/13928958.html?gx=RnAomTM2bmCImZxDqYAkVCoIHuIYVqc)

+<img src="https://jeecgos.oss-cn-beijing.aliyuncs.com/files/tuijian20231220161656.png" width="25%" height="auto">


 ### 系统效果
--- a/db/jeecgboot-mysql-5.7.sql
+++ b/db/jeecgboot-mysql-5.7.sql
--- a/db/其他数据库/jeecgboot-oracle11g.dmp
+++ b/db/其他数据库/jeecgboot-oracle11g.dmp
--- a/db/其他数据库/jeecgboot-oracle11g.sql
+++ b/db/其他数据库/jeecgboot-oracle11g.sql
--- a/db/其他数据库/jeecgboot-sqlserver2019.sql
+++ b/db/其他数据库/jeecgboot-sqlserver2019.sql
--- a/db/增量SQL/3.5.5升级到3.6.0升级脚本.sql
+++ b/db/增量SQL/3.5.5升级到3.6.0升级脚本.sql
@ -1,155 +0,0 @@
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
-- 新增用户职位表关系表
-CREATE TABLE sys_user_position  (
-id varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
-user_id varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户id',
-position_id varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '职位id',
-create_by varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
-create_time datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-update_by varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
-update_time datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
-PRIMARY KEY (id) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
-ALTER TABLE sys_user_position
-ADD INDEX idx_sup_user_id(user_id) USING BTREE,
-ADD INDEX idx_sup_position_id(position_id) USING BTREE,
-ADD INDEX idx_sup_user_position_id(user_id, position_id) USING BTREE;
-
-- 删除用户表的职位
-ALTER TABLE sys_user DROP COLUMN post;
-
-
-
-- 用户租户关系表修改索引
-ALTER TABLE `sys_user_tenant` 
-DROP INDEX `uniq_sut_user_rel_tenant`,
-ADD INDEX `idx_sut_user_rel_tenant`(`user_id`, `tenant_id`) USING BTREE;
-
-ALTER TABLE `sys_user_depart` 
-DROP INDEX `idx_sud_user_dep_id`,
-ADD UNIQUE INDEX `idx_sud_user_dep_id`(`user_id`, `dep_id`) USING BTREE;
-
-
-- 新增企业微信和钉钉配置表，通过租户模式隔离
-CREATE TABLE sys_third_app_config  (
-id varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-tenant_id int(10) NOT NULL DEFAULT 0 COMMENT '租户id',
-agent_id varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '钉钉/企业微信应用id',
-client_id varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '钉钉/企业微信 应用id',
-client_secret varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '钉钉/企业微信应用id对应的秘钥',
-third_type varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '第三方类别(dingtalk 钉钉 wechat_enterprise 企业微信)',
-agent_app_secret varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '自建应用Secret',
-status int(1) NULL DEFAULT 1 COMMENT '是否启用(0-否,1-是)',
-create_time datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-update_time datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-PRIMARY KEY (id) USING BTREE,
-UNIQUE INDEX uniq_stac_third_type_tenant_id(tenant_id, third_type) USING BTREE,
-INDEX idx_stac_tenant_id(tenant_id) USING BTREE,
-INDEX idx_stac_third_type(third_type) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '租户第三方配置表' ROW_FORMAT = Dynamic;
-
-ALTER TABLE sys_third_account
-ADD UNIQUE INDEX uniq_sta_user_id_third_type(sys_user_id, third_type) USING BTREE,
-ADD UNIQUE INDEX uniq_sta_third_user_id_third_type(third_user_id, third_type) USING BTREE,
-ADD UNIQUE INDEX uniq_sta_third_user_uuid_third_type(third_user_uuid, third_type) USING BTREE;
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) VALUES ('1629109281748291586', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '第三方配置', '/third/app', 'system/appconfig/ThirdAppConfigList', 1, '', NULL, 1, NULL, '0', 13.00, 0, 'ant-design:setting-outlined', 1, 0, 0, 0, NULL, 'admin', '2023-02-24 21:21:35', 'admin', '2023-02-24 21:51:05', 0, 0, NULL, 0);
-
-ALTER TABLE sys_third_account
-ADD COLUMN tenant_id int(10) NULL DEFAULT 0 COMMENT '租户id' AFTER realname;
-update sys_third_account set tenant_id = 0;
-
-ALTER TABLE sys_third_account
-DROP INDEX uniq_sta_third_user_id_third_type,
-DROP INDEX uniq_sta_third_user_uuid_third_type,
-DROP INDEX uniq_sta_user_id_third_type,
-ADD UNIQUE INDEX uniq_sta_third_user_id_third_type(third_user_id, third_type, tenant_id) USING BTREE,
-ADD UNIQUE INDEX uniq_sta_third_user_uuid_third_type(third_user_uuid, third_type, tenant_id) USING BTREE;
-
-ALTER TABLE `sys_third_app_config` 
-DROP INDEX `uniq_stac_third_type_tenant_id`;
-
-
-- 新增租户默认产品包
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) VALUES ('1674708136602542082', '', '我的租户', '/mytenant', 'layouts/RouteView', 1, '', NULL, 0, NULL, '0', 4.20, 0, 'ant-design:user-outlined', 0, 0, 0, 0, NULL, 'admin', '2023-06-30 17:15:09', 'admin', '2023-06-30 18:35:40', 0, 0, NULL, 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) VALUES ('1663816667704500225', '1674708136602542082', '我的租户', '/tenant/MyTenantList', 'system/tenant/MyTenantList', 1, '', NULL, 1, NULL, '0', 1.00, 0, 'ant-design:user-outlined', 1, 0, 0, 0, NULL, 'admin', '2023-05-31 15:56:20', 'admin', '2023-06-30 18:37:26', 0, 0, NULL, 0);
-UPDATE sys_permission SET parent_id = '1674708136602542082' WHERE component = 'system/user/TenantUserList';
-UPDATE sys_permission SET parent_id = '1674708136602542082' WHERE component = 'system/role/TenantRoleList';
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) VALUES ('1661572802889007106', '', '租户管理', '/tenant/setting', 'layouts/RouteView', 1, NULL, NULL, 0, NULL, '1', 4.10, 0, 'ant-design:setting-outlined', 0, 0, 0, 0, NULL, 'admin', '2023-05-25 11:20:01', 'admin', '2023-06-30 18:37:04', 0, 0, '1', 0);
-UPDATE sys_permission SET parent_id = '1661572802889007106' WHERE component = 'system/tenant/index';
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) VALUES ('1668174661456171010', '1661572802889007106', '租户默认套餐', '/tenant/TenantDefaultPack', 'system/tenant/TenantDefaultPackList', 1, '', NULL, 1, NULL, '0', 5.00, 0, 'ant-design:folder-filled', 1, 0, 0, 0, NULL, 'admin', '2023-06-12 16:33:27', 'admin', '2023-06-30 19:09:24', 0, 0, NULL, 0);
-ALTER TABLE sys_tenant_pack
-ADD COLUMN pack_type varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'custom' COMMENT '产品包类型(default 默认产品包 custom 自定义产品包)' AFTER pack_code;
-update sys_tenant_pack set pack_type = 'custom';
-
-ALTER TABLE sys_user_tenant
-MODIFY COLUMN status varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态(1 正常 2 离职 3 待审核 4 拒绝 5 邀请加入)' AFTER tenant_id;
-
-UPDATE sys_permission SET component = 'system/tenant/my/MyTenantList' WHERE component = 'system/tenant/MyTenantList';
-UPDATE sys_permission SET component = 'system/tenant/pack/TenantDefaultPackList' WHERE component = 'system/tenant/TenantDefaultPackList';
-UPDATE sys_permission SET component = 'system/tenant/TenantUserList', url='/system/tenant/TenantUserList' WHERE component = 'system/user/TenantUserList';
-
-
-- 系统通知类型新增租户邀请
-ALTER TABLE sys_announcement
-MODIFY COLUMN bus_type varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '业务类型(email:邮件 bpm:流程 tenant_invite:租户邀请)' AFTER del_flag;
-
-
-- 修改部门表org_category字段的注释
-ALTER TABLE `sys_depart`
-MODIFY COLUMN `org_category` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '1' COMMENT '机构类别 1公司，2组织机构，3岗位' AFTER `description`;
-
-
-- 日志显示实际名称 ---
-ALTER TABLE `sys_data_log`
-ADD COLUMN `create_name` varchar(100) NULL COMMENT '创建人真实名称' AFTER `create_by`;
-
-UPDATE sys_data_log
-SET create_name = (SELECT sys_user.realname FROM sys_user WHERE sys_user.username = sys_data_log.create_by)
-WHERE create_name = '' OR create_name IS NULL;
-
-
-- 新增表字典白名单配置表
-CREATE TABLE `sys_table_white_list`  (
-  `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键id',
-  `table_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '允许的表名',
-  `field_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '允许的字段名，多个用逗号分割',
-  `status` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '1' COMMENT '状态，1=启用，0=禁用',
-  `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-  `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-  PRIMARY KEY (`id`) USING BTREE,
-  UNIQUE INDEX `uniq_sys_table_white_list_table_name`(`table_name`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '字典表白名单' ROW_FORMAT = DYNAMIC;
-- 默认数据
-INSERT INTO `sys_table_white_list` (`id`, `table_name`, `field_name`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1701578033271521282', 'sys_user', 'id,realname,username', '1', 'admin', '2023-09-12 10:46:32', NULL, NULL);
-INSERT INTO `sys_table_white_list` (`id`, `table_name`, `field_name`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1701581935488385025', 'oa_officialdoc_organcode', 'id,organ_name', '1', 'admin', '2023-09-12 11:02:02', NULL, NULL);
-INSERT INTO `sys_table_white_list` (`id`, `table_name`, `field_name`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1701581977733414913', 'demo', 'id,name', '1', 'admin', '2023-09-12 11:02:12', NULL, NULL);
-INSERT INTO `sys_table_white_list` (`id`, `table_name`, `field_name`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1701582035472203777', 'sys_permission', 'id,name', '1', 'admin', '2023-09-12 11:02:26', NULL, NULL);
-INSERT INTO `sys_table_white_list` (`id`, `table_name`, `field_name`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1701582087619985409', 'onl_drag_comp', 'id,comp_name', '1', 'admin', '2023-09-12 11:02:38', NULL, NULL);
-INSERT INTO `sys_table_white_list` (`id`, `table_name`, `field_name`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1701582136420712450', 'sys_depart', 'id,depart_name', '1', 'admin', '2023-09-12 11:02:50', NULL, NULL);
-INSERT INTO `sys_table_white_list` (`id`, `table_name`, `field_name`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1701582163599802370', 'design_form', 'id,desform_name,desform_code', '1', 'admin', '2023-09-12 11:02:56', NULL, NULL);
-INSERT INTO `sys_table_white_list` (`id`, `table_name`, `field_name`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1701582190187495426', 'onl_cgform_head', 'table_txt,table_name', '1', 'admin', '2023-09-12 11:03:03', NULL, NULL);
-INSERT INTO `sys_table_white_list` (`id`, `table_name`, `field_name`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1701582254301626370', 'oa_wps_file', 'id,name', '1', 'admin', '2023-09-12 11:03:18', NULL, NULL);
-
-INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1701575168519839746', 'd7d6e2e4e2934f2c9385a623fd98c6f3', '字典表白名单', '/system/tableWhiteList', 'system/tableWhiteList/SysTableWhiteListList', 1, '', NULL, 1, NULL, '0', 13.00, 0, 'ant-design:table-outlined', 1, 0, 0, 0, NULL, 'admin', '2023-09-12 20:35:09', 'admin', '2023-09-12 20:45:08', 0, 0, NULL, 0);
-
-
-- 系统通知卡顿问题性能优化 ---
-ALTER TABLE `sys_announcement_send` 
-MODIFY COLUMN `read_flag` int(2) NULL DEFAULT NULL COMMENT '阅读状态（0未读，1已读）' AFTER `user_id`;
-
-ALTER TABLE `sys_announcement`
-MODIFY COLUMN `msg_abstract` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '摘要/扩展业务参数' AFTER `user_ids`;
-
-
-- 字典表 加颜色配置---
-ALTER TABLE sys_dict_item
-ADD COLUMN item_color varchar(10) NULL COMMENT '字典项颜色' AFTER item_value;
-
-
-SET FOREIGN_KEY_CHECKS = 1;
--- a/db/增量SQL/3.6.0升级到3.6.1升级脚本.sql
+++ b/db/增量SQL/3.6.0升级到3.6.1升级脚本.sql
@ -0,0 +1,11 @@
+-- 新增风格一对多内嵌和Tab风格
+INSERT INTO sys_permission (id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+ VALUES ('1691031996d5931315212', '1455100420297859074', 'AUTO在线一对多内嵌', '/online/cgformInnerTableList/:id', 'super/online/cgform/auto/innerTable/OnlCgformInnerTableList', 1, '', NULL, 1, NULL, '0', 1.00, 0, NULL, 1, 0, 1, 0, NULL, 'admin', '2023-08-14 18:20:20', 'admin', '2023-08-14 18:46:18', 0, 0, NULL, 0);
+INSERT INTO sys_permission (id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+ VALUES ('1691031996d5931315213', '1455100420297859074', 'AUTO在线Tab风格', '/online/cgformTabList/:id', 'super/online/cgform/auto/tab/OnlCgformTabList', 1, '', NULL, 1, NULL, '0', 1.00, 0, NULL, 1, 0, 1, 0, NULL, 'admin', '2023-08-14 18:20:20', 'admin', '2023-08-14 18:46:18', 0, 0, NULL, 0);
+
+-- 【安全】online敏感接口，加权限注解（sql解析接口、同步数据库接口、导入表接口）
+INSERT INTO sys_permission (id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) VALUES ('1699374704168534017', '1460888189937176577', 'SQL解析', NULL, NULL, 0, NULL, NULL, 2, 'online:report:parseSql', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-09-06 18:51:17', NULL, NULL, 0, 0, '1', 0);
+INSERT INTO sys_permission (id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) VALUES ('1699374509749960705', '1455101470794850305', '查询数据库表名', NULL, NULL, 0, NULL, NULL, 2, 'online:form:queryTables', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-09-06 18:50:31', NULL, NULL, 0, 0, '1', 0);
+INSERT INTO sys_permission (id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) VALUES ('1699374269152100354', '1455101470794850305', '同步数据库', NULL, NULL, 0, NULL, NULL, 2, 'online:form:syncDb', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-09-06 18:49:33', NULL, NULL, 0, 0, '1', 0);
+update sys_permission set is_leaf=0 where id in ('1460888189937176577','1455101470794850305');
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -19,6 +19,8 @@ services:
      --default-authentication-plugin=caching_sha2_password
    ports:
      - 3306:3306
+    networks:
+      - jeecg-boot

  jeecg-boot-redis:
    image: redis:5.0
@ -27,6 +29,8 @@ services:
    restart: always
    hostname: jeecg-boot-redis
    container_name: jeecg-boot-redis
+    networks:
+      - jeecg-boot

  jeecg-boot-system:
    build:
@ -39,4 +43,10 @@ services:
    image: jeecg-boot-system
    hostname: jeecg-boot-system
    ports:
-      - 8080:8080
+      - 8080:8080
+    networks:
+      - jeecg-boot
+
+networks:
+  jeecg-boot:
+    name: jeecg_boot
--- a/jeecg-boot-base-core/pom.xml
+++ b/jeecg-boot-base-core/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jeecgframework.boot</groupId>
 		<artifactId>jeecg-boot-parent</artifactId>
-		<version>3.6.0</version>
+		<version>3.6.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jeecg-boot-base-core</artifactId>
@ -256,6 +256,15 @@
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
 		</dependency>
+		<!--加载hutool-->
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-crypto</artifactId>
+		</dependency>
 	</dependencies>

 </project>
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@ -9,10 +9,7 @@ import org.apache.shiro.spring.LifecycleBeanPostProcessor;
 import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
 import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
-import org.crazycake.shiro.IRedisManager;
-import org.crazycake.shiro.RedisCacheManager;
-import org.crazycake.shiro.RedisClusterManager;
-import org.crazycake.shiro.RedisManager;
+import org.crazycake.shiro.*;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.JeecgBaseConfig;
@ -20,11 +17,13 @@ import org.jeecg.config.shiro.filters.CustomShiroFilterFactoryBean;
 import org.jeecg.config.shiro.filters.JwtFilter;
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.core.env.Environment;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.JedisCluster;
@ -32,6 +31,7 @@ import redis.clients.jedis.JedisCluster;
 import javax.annotation.Resource;
 import javax.servlet.Filter;
 import java.util.*;
+import java.util.stream.Collectors;

 /**
 * @author: Scott
@ -49,6 +49,8 @@ public class ShiroConfig {
    private Environment env;
    @Resource
    private JeecgBaseConfig jeecgBaseConfig;
+    @Autowired(required = false)
+    private RedisProperties redisProperties;

    /**
     * Filter Chain定义说明
@ -119,6 +121,8 @@ public class ShiroConfig {
        filterChainDefinitionMap.put("/swagger**/**", "anon");
        filterChainDefinitionMap.put("/webjars/**", "anon");
        filterChainDefinitionMap.put("/v2/**", "anon");
+        // 企业微信证书排除
+        filterChainDefinitionMap.put("/WW_verify*", "anon");
        
        filterChainDefinitionMap.put("/sys/annountCement/show/**", "anon");

@ -249,6 +253,19 @@ public class ShiroConfig {
    public IRedisManager redisManager() {
        log.info("===============(2)创建RedisManager,连接Redis..");
        IRedisManager manager;
+
+        // sentinel cluster redis
+        if (Objects.nonNull(redisProperties)
+                && Objects.nonNull(redisProperties.getSentinel())
+                && !CollectionUtils.isEmpty(redisProperties.getSentinel().getNodes())) {
+            RedisSentinelManager sentinelManager = new RedisSentinelManager();
+            sentinelManager.setMasterName(redisProperties.getSentinel().getMaster());
+            sentinelManager.setHost(String.join(",", redisProperties.getSentinel().getNodes()));
+            sentinelManager.setPassword(redisProperties.getSentinel().getPassword());
+            sentinelManager.setDatabase(redisProperties.getDatabase());
+
+            return sentinelManager;
+        }
        // redis 单机支持，在集群为空，或者集群无机器时候使用 add by jzyadmin@163.com
        if (lettuceConnectionFactory.getClusterConfiguration() == null || lettuceConnectionFactory.getClusterConfiguration().getClusterNodes().isEmpty()) {
            RedisManager redisManager = new RedisManager();
--- a/jeecg-module-demo/pom.xml
+++ b/jeecg-module-demo/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-boot-parent</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/pom.xml
+++ b/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-system-api</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/pom.xml
+++ b/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-system-api</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/jeecg-module-system/jeecg-system-api/pom.xml
+++ b/jeecg-module-system/jeecg-system-api/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-module-system</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/jeecg-module-system/jeecg-system-biz/pom.xml
+++ b/jeecg-module-system/jeecg-system-biz/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jeecgframework.boot</groupId>
 		<artifactId>jeecg-module-system</artifactId>
-		<version>3.6.0</version>
+		<version>3.6.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/firewall/SqlInjection/impl/DictTableWhiteListHandlerImpl.java
@ -100,8 +100,8 @@ public class DictTableWhiteListHandlerImpl implements IDictTableWhiteListHandler
            // 针对转义字符进行解码
            dictCodeString = URLDecoder.decode(dictCodeString, "UTF-8");
        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            this.throwException("字典code解码失败，可能是使用了非法字符，请检查！");
+            log.warn(e.getMessage());
+            //this.throwException("字典code解码失败，可能是使用了非法字符，请检查！");
        }
        dictCodeString = dictCodeString.trim();
        String[] arr = dictCodeString.split(SymbolConstant.COMMA);
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/WechatVerifyController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/WechatVerifyController.java
@ -0,0 +1,36 @@
+package org.jeecg.modules.system.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+
+/**
+ * @Description: 企业微信证书验证
+ * @author: wangshuai
+ * @date: 2023/12/6 10:42
+ */
+@RestController
+@Slf4j
+public class WechatVerifyController {
+
+    /**
+     * 企业微信验证
+     */
+    @RequestMapping(value = "/WW_verify_{code}.txt")
+    public void mpVerify(@PathVariable("code") String code, HttpServletResponse response) {
+        try {
+            PrintWriter writer = response.getWriter();
+            writer.write(code);
+            writer.close();
+        } catch (Exception e) {
+            log.error("企业微信证书验证失败！");
+            log.error(e.getMessage(), e);
+            e.printStackTrace();
+        }
+    }
+}
+
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserPositionMapper.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserPositionMapper.java
@ -1,16 +1,17 @@
 package org.jeecg.modules.system.mapper;

-import java.util.List;
-
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.entity.SysUserPosition;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.system.vo.SysUserPositionVo;

+import java.util.List;
+
 /**
 * @Description: 用户职位关系表
 * @Author: jeecg-boot
@ -64,7 +65,8 @@ public interface SysUserPositionMapper extends BaseMapper<SysUserPosition> {
     * @param tenantId
     * @return
     */
-    List<String> getPositionIdByUserTenantId(@Param("userId")String userId, @Param("tenantId")Integer tenantId);
+    @InterceptorIgnore(tenantLine = "true")
+    List<String> getPositionIdByUserTenantId(@Param("userId") String userId, @Param("tenantId") Integer tenantId);

    /**
     * 根据用户id获取用户职位
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserPositionMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserPositionMapper.xml
@ -26,7 +26,9 @@
        LEFT JOIN sys_position sp ON sup.position_id = sp.id
        WHERE
        sup.user_id = #{userId}
-        AND sp.tenant_id = #{tenantId}
+       <if test="tenantId != null and tenantId != 0">
+           AND sp.tenant_id = #{tenantId}
+       </if>
    </select>

    <!--职位列表移除成员-->
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ImportFileServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ImportFileServiceImpl.java
@ -24,4 +24,9 @@ public class ImportFileServiceImpl implements ImportFileServiceI {
    public String doUpload(byte[] data) {
        return CommonUtils.uploadOnlineImage(data, upLoadPath, "import", uploadType);
    }
+
+    @Override
+    public String doUpload(byte[] data, String saveUrl) {
+        return CommonUtils.uploadOnlineImage(data, upLoadPath, "import", uploadType);
+    }
 }
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@ -1,13 +1,11 @@
 package org.jeecg.modules.system.service.impl;

-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@ -28,7 +26,6 @@ import org.jeecg.common.constant.enums.MessageTypeEnum;
 import org.jeecg.common.constant.enums.RoleIndexConfigEnum;
 import org.jeecg.common.desensitization.annotation.SensitiveEncode;
 import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.common.util.*;
@ -43,9 +40,9 @@ import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.system.vo.SysUserDepVo;
 import org.jeecg.modules.system.vo.SysUserPositionVo;
 import org.jeecg.modules.system.vo.UserAvatar;
+import org.jeecg.modules.system.vo.lowapp.AppExportUserVo;
 import org.jeecg.modules.system.vo.lowapp.DepartAndUserInfo;
 import org.jeecg.modules.system.vo.lowapp.DepartInfo;
-import org.jeecg.modules.system.vo.lowapp.AppExportUserVo;
 import org.jeecg.modules.system.vo.lowapp.UpdateDepartInfo;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@ -103,13 +100,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	@Autowired
 	private SysThirdAccountMapper sysThirdAccountMapper;
 	@Autowired
-	ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService;
+    ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService;
 	@Autowired
-	ThirdAppDingtalkServiceImpl dingtalkService;
+    ThirdAppDingtalkServiceImpl dingtalkService;
 	@Autowired
-	SysRoleIndexMapper sysRoleIndexMapper;
+    SysRoleIndexMapper sysRoleIndexMapper;
 	@Autowired
-	SysTenantMapper sysTenantMapper;
+    SysTenantMapper sysTenantMapper;
 	@Autowired
    private SysUserTenantMapper relationMapper;
 	@Autowired
@ -178,8 +175,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 				} else {
 					item.setRelTenantIds("");
 				}
+				Integer posTenantId = null;
+				if (MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL) {
+					posTenantId = tenantId;		
+				}
 				//查询用户职位关系表(获取租户下面的)
-				List<String> positionList =  sysUserPositionMapper.getPositionIdByUserTenantId(item.getId(),tenantId);
+				//update-begin---author:wangshuai---date:2023-11-15---for:【QQYUN-7028】用户职务保存后未回显---
+				List<String> positionList =  sysUserPositionMapper.getPositionIdByUserTenantId(item.getId(),posTenantId);
+				//update-end---author:wangshuai---date:2023-11-15---for:【QQYUN-7028】用户职务保存后未回显---
 				//update-end---author:wangshuai ---date:20230228  for：[QQYUN-4354]加入更多字段：当前加入时间应该取当前租户的/职位也是当前租户下的------------
 				item.setPost(CommonUtils.getSplitText(positionList,SymbolConstant.COMMA));
 				
@ -929,7 +932,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                relation.setUserId(userId);
                relation.setTenantId(Integer.valueOf(tenantId));
                relation.setStatus(CommonConstant.STATUS_1);
-                relationMapper.insert(relation);
+                
+				LambdaQueryWrapper sysUserTenantQueryWrapper = new LambdaQueryWrapper<SysUserTenant>()
+						.eq(SysUserTenant::getUserId, userId)
+						.eq(SysUserTenant::getTenantId,Integer.valueOf(tenantId));
+				SysUserTenant tenantPresent = relationMapper.selectOne(sysUserTenantQueryWrapper);
+				if (tenantPresent != null) {
+					tenantPresent.setStatus(CommonConstant.STATUS_1);
+					relationMapper.updateById(tenantPresent);
+				}else{
+					relationMapper.insert(relation);
+				}
            }
        }else{
 			//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
@ -960,7 +973,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
        LambdaQueryWrapper<SysUserTenant> query = new LambdaQueryWrapper<>();
        query.eq(SysUserTenant::getUserId, userId);
        //数据库的租户id
-		List<Integer> oldTenantIds = relationMapper.getTenantIdsNoStatus(userId);
+		List<Integer> oldTenantIds = relationMapper.getTenantIdsByUserId(userId);
        //如果传过来的租户id为空，那么就删除租户
        if (oConvertUtils.isEmpty(relTenantIds) && CollectionUtils.isNotEmpty(oldTenantIds)) {
            this.deleteTenantByUserId(userId, null);
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeForm.ftl
@ -40,7 +40,7 @@
 	          <j-switch v-model:value="formData.${po.fieldName}" <#if po.dictField != 'is_open'>:options="${po.dictField}"</#if> <#if po.readonly=='Y'>disabled<#else>:disabled="disabled"</#if>></j-switch>
 			<#elseif po.classType =='pca'>
 	          <#assign need_pca = true>
-	          <j-area-linkage v-model:value="formData.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled<#else>:disabled="disabled"</#if> />
+	          <j-area-select v-model:value="formData.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled<#else>:disabled="disabled"</#if> />
 			<#elseif po.classType =='markdown'>
 	          <#assign need_markdown = true>
 	          <j-markdown-editor v-model:value="formData.${autoStringSuffixForModel(po)}" id="${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled<#else>:disabled="disabled"</#if>></j-markdown-editor>
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeImport.ftl
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeImport.ftl
@ -29,7 +29,7 @@
  import { TimePicker } from 'ant-design-vue';
 </#if>
 <#if need_pca>
-  import JAreaLinkage from '/@/components/Form/src/jeecg/components/JAreaLinkage.vue';
+  import JAreaSelect from '/@/components/Form/src/jeecg/components/JAreaSelect.vue';
 </#if>
 <#if need_upload>
  import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/form/native/vue3NativeSearch.ftl
@ -14,12 +14,12 @@
 	</#if>
 	<#if po.queryMode=='single'>
          <#if query_field_no gt 1>  </#if><a-col :lg="6">
-            <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}">
+            <#if query_field_no gt 1>  </#if><a-form-item name="${autoStringSuffixForModel(po)}">
              <#if query_field_no gt 1>  </#if><template #label><span title="${po.filedComment}"><#if po.filedComment?default("")?trim?length gt 4>${po.filedComment?substring(0,4)}<#else>${po.filedComment}</#if></span></template>
            <#if po.classType=='sel_search'>
              <#if query_field_no gt 1>  </#if><j-search-select placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" dict="${po.dictTable},${po.dictText},${po.dictField}" />
            <#elseif po.classType=='sel_user'>
-              <#if query_field_no gt 1>  </#if><j-select-user-by-dept placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" />
+              <#if query_field_no gt 1>  </#if><j-select-user-by-dept placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" @change="(value)=>handleFormJoinChange('${po.fieldName}',value)"/>
            <#elseif po.classType=='switch'>
              <#if query_field_no gt 1>  </#if><j-switch placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" <#if po.dictField!= 'is_open'>:options="${po.dictField}"</#if> query />
            <#elseif po.classType=='sel_depart'>
@ -32,8 +32,10 @@
              <#if query_field_no gt 1>  </#if><a-date-picker valueFormat="YYYY-MM-DD" placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" />
            <#elseif po.classType=='datetime'>
              <#if query_field_no gt 1>  </#if><a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" />
+            <#elseif po.classType=='time'>
+              <#if query_field_no gt 1>  </#if><time-picker valueFormat="HH:mm:ss" placeholder="请选择${po.filedComment}" v-model:value="queryParam.${po.fieldName}" />
            <#elseif po.classType=='pca'>
-              <#if query_field_no gt 1>  </#if><j-area-linkage v-model:value="queryParam.${po.fieldName}" placeholder="请选择${po.filedComment}" @change="(value) => handleAreaChange('${po.fieldName}', value)" /> 
+              <#if query_field_no gt 1>  </#if><j-area-select v-model:value="queryParam.${po.fieldName}" placeholder="请选择${po.filedComment}" /> 
            <#elseif po.classType=='sel_tree'>
              <#if query_field_no gt 1>  </#if><j-tree-select v-model:value="queryParam.${po.fieldName}" placeholder="请选择${po.filedComment}" <#if po.dictText??><#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}" <#elseif po.dictText?split(',')[1]??>pidField:"${po.dictText?split(',')[1]}", <#elseif po.dictText?split(',')[3]??>hasChildField:"${po.dictText?split(',')[3]}"</#if> </#if>pidValue="${po.dictField}" />
            <#elseif po.classType=='popup'>
@ -60,7 +62,7 @@
              <#if query_field_no gt 1>  </#if><a-input placeholder="请输入${po.filedComment}" v-model:value="queryParam.${po.fieldName}"></a-input>
         </#if>
      <#else>
-              <#if query_field_no gt 1>  </#if><a-input placeholder="请输入${po.filedComment}" v-model:value="queryParam.${po.fieldName}"></a-input>
+              <#if query_field_no gt 1>  </#if><a-input placeholder="请输入${po.filedComment}" v-model:value="queryParam.${autoStringSuffixForModel(po)}"></a-input>
      </#if>
            <#if query_field_no gt 1>  </#if></a-form-item>
          <#if query_field_no gt 1>  </#if></a-col>
@ -69,17 +71,45 @@
            <#if query_field_no gt 1>  </#if><a-form-item>
               <#if query_field_no gt 1>  </#if><template #label><span title="${po.filedComment}"><#if po.filedComment?default("")?trim?length gt 4>${po.filedComment?substring(0,4)}<#else>${po.filedComment}</#if></span></template>
      <#if po.classType=='date'>
-               <#if query_field_no gt 1>  </#if><a-date-picker value-format="YYYY-MM-DD" placeholder="请选择开始时间" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust"/>
-               <#if query_field_no gt 1>  </#if><span class="query-group-split-cust">~</span>
-               <#if query_field_no gt 1>  </#if><a-date-picker value-format="YYYY-MM-DD" placeholder="请选择结束日期" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust"/>
+               <#if query_field_no gt 1>  </#if><div style="display: flex">
+                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_begin" style="margin-bottom: 0;">
+                   <#if query_field_no gt 1>  </#if><a-date-picker value-format="YYYY-MM-DD" placeholder="请选择开始日期" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust"/>
+                 <#if query_field_no gt 1>  </#if></a-form-item>  
+                 <#if query_field_no gt 1>  </#if><span class="query-group-split-cust">~</span>
+                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_end" style="margin-bottom: 0;">
+                   <#if query_field_no gt 1>  </#if><a-date-picker value-format="YYYY-MM-DD" placeholder="请选择结束日期" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust"/>
+                 <#if query_field_no gt 1>  </#if></a-form-item>
+               <#if query_field_no gt 1>  </#if></div>
+      <#elseif po.classType=='time'>
+               <#if query_field_no gt 1>  </#if><div style="display: flex">
+                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_begin" style="margin-bottom: 0;">
+                   <#if query_field_no gt 1>  </#if><time-picker value-format="HH:mm:ss" placeholder="请选择开始时间" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust"/>
+                 <#if query_field_no gt 1>  </#if></a-form-item>
+                 <#if query_field_no gt 1>  </#if><span class="query-group-split-cust">~</span>
+                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_end" style="margin-bottom: 0;">
+                   <#if query_field_no gt 1>  </#if><time-picker value-format="HH:mm:ss" placeholder="请选择结束日期" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust"/>
+                 <#if query_field_no gt 1>  </#if></a-form-item>
+               <#if query_field_no gt 1>  </#if></div>
      <#elseif po.classType=='datetime'>
-               <#if query_field_no gt 1>  </#if><a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust" />
-               <#if query_field_no gt 1>  </#if><span class="query-group-split-cust">~</span>
-               <#if query_field_no gt 1>  </#if><a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust" />
+               <#if query_field_no gt 1>  </#if><div style="display: flex">
+                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_begin" style="margin-bottom: 0;">
+                   <#if query_field_no gt 1>  </#if><a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust" />
+                 <#if query_field_no gt 1>  </#if></a-form-item>
+                 <#if query_field_no gt 1>  </#if><span class="query-group-split-cust">~</span>
+                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_end" style="margin-bottom: 0;">
+                   <#if query_field_no gt 1>  </#if><a-date-picker showTime value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust" />
+                 <#if query_field_no gt 1>  </#if></a-form-item>
+               <#if query_field_no gt 1>  </#if></div>
      <#else>
-               <#if query_field_no gt 1>  </#if><a-input placeholder="请输入最小值" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust"></a-input>
-               <#if query_field_no gt 1>  </#if><span class="query-group-split-cust">~</span>
-               <#if query_field_no gt 1>  </#if><a-input placeholder="请输入最大值" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust"></a-input>
+               <#if query_field_no gt 1>  </#if><div style="display: flex">
+                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_begin" style="margin-bottom: 0;">
+                   <#if query_field_no gt 1>  </#if><a-input placeholder="请输入最小值" v-model:value="queryParam.${po.fieldName}_begin" class="query-group-cust"></a-input>
+                 <#if query_field_no gt 1>  </#if></a-form-item>       
+                 <#if query_field_no gt 1>  </#if><span class="query-group-left query-group-split-cust">~</span>
+                 <#if query_field_no gt 1>  </#if><a-form-item name="${po.fieldName}_end" style="margin-bottom: 0;"> 
+                  <#if query_field_no gt 1>  </#if><a-input placeholder="请输入最大值" v-model:value="queryParam.${po.fieldName}_end" class="query-group-cust"></a-input>
+                 <#if query_field_no gt 1>  </#if></a-form-item>
+               <#if query_field_no gt 1>  </#if></div>
      </#if>
            <#if query_field_no gt 1>  </#if></a-form-item>
          <#if query_field_no gt 1>  </#if></a-col>
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/utils.ftl
@ -132,6 +132,56 @@
  </#if>
 </#function>

+<#-- ** 高级查询生成(Vue3 * -->
+<#function superQueryFieldListForVue3(po,order)>
+    <#-- 字段展示/DB类型 -->
+    <#assign baseAttrs="view: '${po.classType}', type: 'string',">
+    <#if po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
+        <#assign baseAttrs="view: 'number', type: 'number',">
+    </#if>
+
+    <#-- 特殊类型控件扩展字段 -->
+    <#assign extAttrs="">
+    <#assign dictCode="">
+    <#if po.dictTable?default('')?trim?length gt 1 && po.dictText?default('')?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
+        <#assign dictCode="dictTable: '${po.dictTable}', dictCode: '${po.dictField}', dictText: '${po.dictText}'">
+    <#elseif po.dictField?default("")?trim?length gt 1>
+        <#assign dictCode="dictCode: '${po.dictField}'">
+    </#if>
+
+    <#if po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='checkbox'>
+        <#assign extAttrs="${dictCode},">
+    <#elseif po.classType=='cat_tree'>
+        <#-- 分类字典树 -->
+        <#assign extAttrs="pcode: '${po.dictField}',">
+    <#elseif po.classType=='sel_tree'>
+        <#-- 自定义树 -->
+        <#if po.dictText??>
+            <#-- dictText示例:id,pid,name,has_child -->
+            <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
+                <#assign extAttrs="dict: '${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}'">
+            <#elseif po.dictText?split(',')[1]??>
+                <#assign extAttrs="pidField: '${po.dictText?split(',')[1]}'">
+            <#elseif po.dictText?split(',')[3]??>
+                <#assign extAttrs="hasChildField: '${po.dictText?split(',')[3]}'">
+            </#if>
+        </#if>
+        <#assign extAttrs="${extAttrs}, pidValue: '${po.dictField}',">
+    <#elseif po.classType=='popup'>
+        <#-- popup -->
+        <#if po.dictText?default("")?trim?length gt 1 && po.dictText?index_of(',') gt 0>
+        <#-- 如果有多个回填字段,找到popup字段对应的来源字段 -->
+            <#assign orgFieldIx=po.dictText?split(',')?seq_index_of(po.fieldDbName)>
+            <#assign orgField=po.dictField?split(',')[orgFieldIx]>
+        <#else>
+            <#assign orgField=po.dictField?default("")>
+        </#if>
+        <#assign extAttrs="code: '${po.dictTable?default('')}', orgFields: '${orgField}', destFields: '${po.fieldName}', popupMulti: false,">
+    </#if>
+
+    <#return "${po.fieldName}: {title: '${po.filedComment}',order: ${order},${baseAttrs}${extAttrs}}" >
+</#function>
+

 <#-- vue3 获取表单modal的宽度-->
 <#function getModalWidth fieldRowNum>
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@ -37,6 +37,8 @@
                <Icon icon="mdi:chevron-down"></Icon>
              </a-button>
        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
      </template>
       <!--操作栏-->
      <template #action="{ record }">
@ -71,12 +73,12 @@
 </template>

 <script lang="ts" name="${entityPackage}-${entityName?uncap_first}" setup>
-  import {ref, computed, unref} from 'vue';
+  import {ref, reactive, computed, unref} from 'vue';
  import {BasicTable, useTable, TableAction} from '/@/components/Table';
  import {useModal} from '/@/components/Modal';
  import { useListPage } from '/@/hooks/system/useListPage'
  import ${entityName}Modal from './components/${entityName}Modal.vue'
-  import {columns, searchFormSchema} from './${entityName}.data';
+  import {columns, searchFormSchema, superQuerySchema} from './${entityName}.data';
  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
  import { downloadFile } from '/@/utils/common/renderUtils';
  import { useUserStore } from '/@/store/modules/user';
@ -91,6 +93,7 @@
  <#if bpm_flag==true>
  import { startProcess } from '/@/api/common/api';
  </#if>
+  const queryParam = reactive<any>({});
  const checkedKeys = ref<Array<string | number>>([]);
  const userStore = useUserStore();
  //注册model
@ -133,13 +136,17 @@
              ],
            },
           actionColumn: {
-               width: 150,
+               width: 120,
               fixed:'right'
            },
+            beforeFetch: (params) => {
+              return Object.assign(params, queryParam);
+            },
      },
       exportConfig: {
            name:"${tableVo.ftlDescription}",
            url: getExportUrl,
+            params: queryParam,
          },
          importConfig: {
            url: getImportUrl,
@ -149,6 +156,20 @@

  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext

+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
+
   /**
    * 新增事件
    */
@ -221,6 +242,7 @@
           popConfirm: {
             title: '是否确认删除',
             confirm: handleDelete.bind(null, record),
+             placement: 'topLeft',
           }
         }
       ];
@ -230,6 +252,7 @@
           popConfirm: {
             title: '确认提交流程吗？',
             confirm: handleProcess.bind(null, record),
+             placement: 'topLeft',
           }
         })
       }
@ -244,6 +267,7 @@
           popConfirm: {
             title: '是否确认删除',
             confirm: handleDelete.bind(null, record),
+             placement: 'topLeft',
           }
         }
       ]
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@ -247,8 +247,13 @@ export const formSchema: FormSchema[] = [
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
@ -376,6 +381,16 @@ export const formSchema: FormSchema[] = [
 </#if>
 ];

+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+};
+
+


 /**
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/vue-app/${entityName}Form.vue_uniAppi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/vue-app/${entityName}Form.vue_uniAppi
@ -0,0 +1,93 @@
+<template>
+    <view>
+        <!--标题和返回-->
+		<cu-custom :bgColor="NavBarColor" isBack :backRouterName="backRouteName">
+			<block slot="backText">返回</block>
+			<block slot="content">${tableVo.ftlDescription}</block>
+		</cu-custom>
+		 <!--表单区域-->
+		<view>
+			<form>
+    <#list columns as po><#rt/>
+    <#if po.fieldName !='id'><#rt/>
+         <#if po.classType =='date'>
+              <my-date label="${po.filedComment}：" fields="day" v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}"></my-date>
+         <#elseif po.classType =='datetime'>
+              <my-date label="${po.filedComment}：" v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}"></my-date>
+         <#else>
+              <view class="cu-form-group">
+                <view class="flex align-center">
+                  <view class="title"><text space="ensp">${po.filedComment}：</text></view>
+                  <input <#if "int,BigDecimal,double,"?contains(po.fieldDbType)>type="number"</#if> placeholder="请输入${po.filedComment}" v-model="model.${po.fieldName}"/>
+                </view>
+              </view>
+        </#if>
+    </#if>
+    </#list>
+				<view class="padding">
+					<button class="cu-btn block bg-blue margin-tb-sm lg" @click="onSubmit">
+						<text v-if="loading" class="cuIcon-loading2 cuIconfont-spin"></text>提交
+					</button>
+				</view>
+			</form>
+		</view>
+    </view>
+</template>
+
+<script>
+    import myDate from '@/components/my-componets/my-date.vue'
+
+    export default {
+        name: "${entityName}Form",
+        components:{ myDate },
+        props:{
+          formData:{
+              type:Object,
+              default:()=>{},
+              required:false
+          }
+        },
+        data(){
+            return {
+				CustomBar: this.CustomBar,
+				NavBarColor: this.NavBarColor,
+				loading:false,
+                model: {},
+                backRouteName:'index',
+                url: {
+                  queryById: "/${entityPackage}/${entityName?uncap_first}/queryById",
+                  add: "/${entityPackage}/${entityName?uncap_first}/add",
+                  edit: "/${entityPackage}/${entityName?uncap_first}/edit",
+                },
+            }
+        },
+        created(){
+             this.initFormData();
+        },
+        methods:{
+           initFormData(){
+               if(this.formData){
+                    let dataId = this.formData.dataId;
+                    this.$http.get(this.url.queryById,{params:{id:dataId}}).then((res)=>{
+                        if(res.data.success){
+                            console.log("表单数据",res);
+                            this.model = res.data.result;
+                        }
+                    })
+                }
+            },
+            onSubmit() {
+                let myForm = {...this.model};
+                this.loading = true;
+                let url = myForm.id?this.url.edit:this.url.add;
+				this.$http.post(url,myForm).then(res=>{
+				   console.log("res",res)
+				   this.loading = false
+				   this.$Router.push({name:this.backRouteName})
+				}).catch(()=>{
+					this.loading = false
+				});
+            }
+        }
+    }
+</script>
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/vue-app/${entityName}List.vue_uniAppi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/vue-app/${entityName}List.vue_uniAppi
@ -0,0 +1,44 @@
+<template>
+	<view>
+	   <!--标题和返回-->
+		<cu-custom :bgColor="NavBarColor" isBack>
+			<block slot="backText">返回</block>
+			<block slot="content">${tableVo.ftlDescription}</block>
+		</cu-custom>
+		<!--滚动加载列表-->
+		<mescroll-body ref="mescrollRef" bottom="88"  @init="mescrollInit" :up="upOption" :down="downOption" @down="downCallback" @up="upCallback">
+		    <view class="cu-list menu">
+				<view class="cu-item" v-for="(item,index) in list" :key="index" @click="goHome">
+					<view class="flex" style="width:100%">
+                        <text class="text-lg" style="color: #000;">
+                             {{ item.createBy}}
+                        </text>
+					</view>
+				</view>
+			</view>
+		</mescroll-body>
+	</view>
+</template>
+
+<script>
+	import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
+	import Mixin from "@/common/mixin/Mixin.js";
+
+	export default {
+		name: '${tableVo.ftlDescription}',
+		mixins: [MescrollMixin,Mixin],
+		data() {
+			return {
+				CustomBar:this.CustomBar,
+				NavBarColor:this.NavBarColor,
+				url: "/${entityPackage}/${entityName?uncap_first}/list",
+			};
+		},
+		methods: {
+			goHome(){
+                this.$Router.push({name: "index"})
+			}
+		}
+	}
+</script>
+
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@ -101,6 +101,8 @@
            <Icon icon="mdi:chevron-down"></Icon>
          </a-button>
        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
      </template>
      <!--操作栏-->
      <template #action="{ record }">
@ -137,7 +139,7 @@
  import { ref, reactive } from 'vue';
  import { BasicTable, useTable, TableAction } from '/@/components/Table';
  import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns } from './${entityName}.data';
+  import { columns, superQuerySchema } from './${entityName}.data';
  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './${entityName}.api';
  import { downloadFile } from '/@/utils/common/renderUtils';
  import ${entityName}Modal from './components/${entityName}Modal.vue'
@ -169,7 +171,7 @@
      canResize:false,
      useSearchForm: false,
      actionColumn: {
-        width: 150,
+        width: 120,
        fixed: 'right',
      },
      beforeFetch: (params) => {
@ -198,6 +200,21 @@
    sm: 20,
  });

+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    searchQuery();
+  }
+
+
  /**
   * 新增事件
   */
@ -269,6 +286,7 @@
        popConfirm: {
          title: '是否确认删除',
          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
        }
      }
    ];
@ -278,6 +296,7 @@
        popConfirm: {
          title: '确认提交流程吗？',
          confirm: handleProcess.bind(null, record),
+          placement: 'topLeft',
        }
      })
    }
@ -292,6 +311,7 @@
        popConfirm: {
          title: '是否确认删除',
          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
        }
      }
    ]
@ -326,13 +346,13 @@
  }
  </#if>

-  <#if need_pca>
+  <#if need_pca || need_dept_user>
  /**
-   * 省市区点击事件
+   * form点击事件(以逗号分割)
   * @param key
   * @param value
   */
-  function handleAreaChange(key, value) {
+  function handleFormJoinChange(key, value) {
    queryParam[key] = value.join(',');
  }
  </#if>
@ -394,7 +414,6 @@
      white-space: nowrap;
    }
    .query-group-cust{
-      width: calc(50% - 15px);
      min-width: 100px !important;
    }
    .query-group-split-cust{
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
@ -233,11 +233,16 @@ export const formSchema: FormSchema[] = [
    componentProps:{
      dictCode: "${form_field_dictCode}"
    },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
    componentProps:{
-      dictCode: "${form_field_dictCode}"
-    },
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
    <#elseif po.classType=='sel_search'>
    component: 'JSearchSelect',
    componentProps:{
@ -361,3 +366,12 @@ export const formSchema: FormSchema[] = [
  },
 </#if>
 ];
+
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+};
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@ -212,8 +212,8 @@

 <style lang="less" scoped>
  .antd-modal-form {
-    min-height: 500px !important;
+    height: 500px !important;
    overflow-y: auto;
-    padding: 24px 24px 24px 24px;
+    padding: 14px;
  }
 </style>
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@ -43,6 +43,8 @@
            <Icon icon="ant-design:down-outlined"></Icon>
          </a-button>
        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
      </template>
      <!--操作栏-->
      <template #action="{ record }">
@ -78,12 +80,12 @@

 <script lang="ts" name="${entityPackage}-${entityName?uncap_first}" setup>
  //ts语法
-  import {ref, computed, unref, toRaw, nextTick} from 'vue';
+  import {ref, reactive, computed, unref, toRaw, nextTick} from 'vue';
  import {BasicTable, TableAction} from '/@/components/Table';
  import {useModal} from '/@/components/Modal';
  import { useListPage } from '/@/hooks/system/useListPage'
  import ${entityName}Modal from './components/${entityName}Modal.vue';
-  import {columns,searchFormSchema} from './${entityName}.data';
+  import {columns, searchFormSchema, superQuerySchema} from './${entityName}.data';
  import { downloadFile } from '/@/utils/common/renderUtils';
  import {list, delete${entityName}, batchDelete${entityName}, getExportUrl,getImportUrl, getChildList,getChildListBatch} from './${entityName}.api';
  <#if list_need_pca>
@ -92,6 +94,7 @@
  <#if bpm_flag==true>
  import { startProcess } from '/@/api/common/api';
  </#if>
+  const queryParam = reactive<any>({});
  const expandedRowKeys = ref([]);
  //字典model
  const [registerModal, {openModal}] = useModal();
@ -102,6 +105,7 @@
         title: '${tableVo.ftlDescription}',
         columns,
         canResize:false,
+         isTreeTable: true,
         formConfig: {
           //labelWidth: 120,
           schemas: searchFormSchema,
@ -136,10 +140,14 @@
           width: 240,
           fixed:'right'
         },
+         beforeFetch: (params) => {
+           return Object.assign(params, queryParam);
+         },
    },
     exportConfig: {
          name:"${tableVo.ftlDescription}",
          url: getExportUrl,
+          params: queryParam,
        },
        importConfig: {
          url: getImportUrl,
@ -149,6 +157,19 @@

  const [registerTable, {reload, collapseAll, updateTableDataRecord, findTableDataRecord,getDataSource},{ rowSelection, selectedRowKeys }] = tableContext

+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
  /**
   * 新增事件
   */
@ -357,7 +378,8 @@
         label: '删除',
         popConfirm: {
           title: '是否确认删除',
-           confirm: handleDelete.bind(null, record)
+           confirm: handleDelete.bind(null, record),
+           placement: 'topLeft',
         }
       }
     ];
@ -367,6 +389,7 @@
         popConfirm: {
           title: '确认提交流程吗？',
           confirm: handleProcess.bind(null, record),
+           placement: 'topLeft',
         }
       })
     }
@ -381,6 +404,7 @@
         popConfirm: {
           title: '确定删除吗?',
           confirm: handleDelete.bind(null, record),
+           placement: 'topLeft',
         }
       }
     ]
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@ -273,8 +273,13 @@ export const formSchema: FormSchema[] = [
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
@ -405,6 +410,15 @@ export const formSchema: FormSchema[] = [
 </#if>
 ];

+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+};
+

 /**
 * 流程表单调用这个方法获取formSchema
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@ -111,6 +111,8 @@
            <Icon icon="ant-design:down-outlined"></Icon>
          </a-button>
        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
      </template>
      <!--操作栏-->
      <template #action="{ record }">
@ -148,7 +150,7 @@
  import { ref, reactive, unref } from 'vue';
  import { BasicTable, useTable, TableAction } from '/@/components/Table';
  import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns } from './${entityName}.data';
+  import { columns, superQuerySchema } from './${entityName}.data';
  import {list, delete${entityName}, batchDelete${entityName}, getExportUrl,getImportUrl, getChildList,getChildListBatch} from './${entityName}.api';
  import { downloadFile } from '/@/utils/common/renderUtils';
  import ${entityName}Modal from './components/${entityName}Modal.vue'
@ -207,6 +209,19 @@
    sm: 20,
  });

+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
  /**
   * 新增事件
   */
@ -419,6 +434,7 @@
        popConfirm: {
          title: '确定删除吗?',
          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
        },
      },
    ];
@ -428,6 +444,7 @@
        popConfirm: {
          title: '确认提交流程吗？',
          confirm: handleProcess.bind(null, record),
+          placement: 'topLeft',
        }
      })
    }
@ -447,6 +464,7 @@
        popConfirm: {
          title: '确定删除吗?',
          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
        },
      },
    ];
@ -498,14 +516,14 @@
  }
  </#if>

-  <#if need_pca>
+  <#if need_pca || need_dept_user>
  /**
-   * 省市区点击事件
+   * form点击事件(以逗号分割)
   * @param key
   * @param value
   */
-  function handleAreaChange(key, value) {
-    queryParam.value[key] = value.join(',');
+  function handleFormJoinChange(key, value) {
+    queryParam[key] = value.join(',');
  }
  </#if>

@ -551,7 +569,6 @@
      white-space: nowrap;
    }
    .query-group-cust{
-      width: calc(50% - 15px);
      min-width: 100px !important;
    }
    .query-group-split-cust{
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
@ -263,10 +263,15 @@ export const formSchema: FormSchema[] = [
    componentProps:{
        dictCode: "${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
    componentProps:{
-        dictCode: "${form_field_dictCode}"
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
     },
    <#elseif po.classType=='sel_search'>
    component: 'JSearchSelect',
@ -394,3 +399,12 @@ export const formSchema: FormSchema[] = [
  },
 </#if>
 ];
+
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+};
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@ -208,6 +208,7 @@
      .then(async (res) => {
        if (res.success) {
          await getExpandKeysByPid(formData['${pidFieldName}'], unref(treeData));
+          delete formData['children'];
          emit('ok', {
            isUpdate: unref(isUpdate),
            values: { ...formData },
@ -263,8 +264,8 @@

 <style lang="less" scoped>
  .antd-modal-form {
-    min-height: 500px !important;
+    height: 500px !important;
    overflow-y: auto;
-    padding: 24px 24px 24px 24px;
+    padding: 14px;
  }
 </style>
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@ -37,6 +37,8 @@
                <Icon icon="mdi:chevron-down"></Icon>
              </a-button>
        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
      </template>
       <!--操作栏-->
      <template #action="{ record }">
@ -81,7 +83,7 @@
 </template>

 <script lang="ts" name="${entityPackage}-${entityName?uncap_first}" setup>
-  import {ref, computed, unref,provide} from 'vue';
+  import {ref, reactive, computed, unref,provide} from 'vue';
  import {BasicTable, useTable, TableAction} from '/@/components/Table';
  import { useListPage } from '/@/hooks/system/useListPage'
  import {useModal} from '/@/components/Modal';
@ -90,7 +92,7 @@
 <#list subTables as sub>
  import ${sub.entityName}List from './${sub.entityName}List.vue'
 </#list>
-  import {columns, searchFormSchema} from './${entityName}.data';
+  import {columns, searchFormSchema, superQuerySchema} from './${entityName}.data';
  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
  import {downloadFile} from '/@/utils/common/renderUtils';
 <#if list_need_pca>
@ -104,6 +106,7 @@
  <#if bpm_flag==true>
  import { startProcess } from '/@/api/common/api';
  </#if>
+  const queryParam = reactive<any>({});
  //注册model
  const [registerModal, {openModal}] = useModal();
   //注册table数据
@ -145,6 +148,9 @@
               width: 120,
               fixed:'right'
           },
+           beforeFetch: (params) => {
+             return Object.assign(params, queryParam);
+           },
           pagination:{
               current: 1,
               pageSize: 5,
@ -154,6 +160,7 @@
        exportConfig: {
            name:"${tableVo.ftlDescription}",
            url: getExportUrl,
+            params: queryParam,
        },
        importConfig: {
            url: getImportUrl,
@ -166,6 +173,20 @@
  const mainId = computed(() => (unref(selectedRowKeys).length > 0 ? unref(selectedRowKeys)[0] : ''));
  //下发 mainId,子组件接收
  provide('mainId', mainId);
+
+    // 高级查询配置
+    const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
   /**
    * 新增事件
    */
@ -255,6 +276,7 @@
        popConfirm: {
          title: '是否确认删除',
          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
        }
      }
    ];
@ -278,6 +300,7 @@
        popConfirm: {
          title: '是否确认删除',
          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
        }
      }
    ]
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@ -240,8 +240,13 @@ export const formSchema: FormSchema[] = [
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
@ -507,8 +512,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
@ -627,4 +637,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
 </#if>
 </#list>
 ];
-</#list>
+</#list>
+
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+};
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/[1-n]List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/[1-n]List.vuei
@ -179,6 +179,7 @@
                popConfirm: {
                    title: '是否确认删除',
                    confirm: handleDelete.bind(null, record),
+                    placement: 'topLeft',
                },
            }
        ]
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@ -106,6 +106,8 @@
            <Icon icon="mdi:chevron-down"></Icon>
          </a-button>
        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
      </template>
      <!--操作栏-->
      <template #action="{ record }">
@ -125,6 +127,10 @@
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
         </#if>
+         <#if po.classType=='pca'>
+           <!--省市区字段回显插槽-->
+           {{ getAreaTextByCode(text) }}
+         </#if>
        </template>
        </#if>
       </#list>
@ -150,7 +156,7 @@
  import { BasicTable, useTable, TableAction } from '/@/components/Table';
  import { useListPage } from '/@/hooks/system/useListPage'
  import ${entityName}Modal from './components/${entityName}Modal.vue'
-  import { columns, searchFormSchema } from './${entityName}.data';
+  import { columns, searchFormSchema, superQuerySchema } from './${entityName}.data';
  import { list, deleteOne, batchDelete, getImportUrl,getExportUrl } from './${entityName}.api';
  import { downloadFile } from '/@/utils/common/renderUtils';
  <#include "/common/form/native/vue3NativeImport.ftl">
@ -207,7 +213,20 @@
  const mainId = computed(() => (unref(selectedRowKeys).length > 0 ? unref(selectedRowKeys)[0] : ''));
  //下发 mainId,子组件接收
  provide('mainId', mainId);
-  
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
  /**
   * 新增事件
   */
@ -279,6 +298,7 @@
        popConfirm: {
          title: '是否确认删除',
          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
        }
      }
    ];
@ -288,6 +308,7 @@
         popConfirm: {
           title: '确认提交流程吗？',
           confirm: handleProcess.bind(null, record),
+           placement: 'topLeft',
         }
      })
    }
@ -303,6 +324,7 @@
        popConfirm: {
          title: '是否确认删除',
          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
        },
      },
    ];
@ -390,13 +412,13 @@
  }
  </#if>

-  <#if need_pca>
+  <#if need_pca || need_dept_user>
  /**
-   * 省市区点击事件
+   * form点击事件(以逗号分割)
   * @param key
   * @param value
   */
-  function handleAreaChange(key, value) {
+  function handleFormJoinChange(key, value) {
    queryParam[key] = value.join(',');
  }
  </#if>
@ -410,7 +432,6 @@
      white-space: nowrap;
    }
    .query-group-cust{
-      width: calc(50% - 15px);
      min-width: 100px !important;
    }
    .query-group-split-cust{
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
@ -240,11 +240,16 @@ export const formSchema: FormSchema[] = [
    componentProps:{
      dictCode:"${form_field_dictCode}"
    },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
    componentProps:{
-      dictCode:"${form_field_dictCode}"
-    },
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
    <#elseif po.classType=='sel_search'>
    component: 'JSearchSelect',
    componentProps:{
@ -507,11 +512,16 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
    componentProps:{
      dictCode:"${form_field_dictCode}"
    },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
    componentProps:{
-      dictCode:"${form_field_dictCode}"
-    },
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
    <#elseif po.classType=='sel_search'>
    component: 'JSearchSelect',
    componentProps:{
@ -627,4 +637,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
 </#if>
 </#list>
 ];
-</#list>
+</#list>
+
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+};
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/[1-n]List.vuei
@ -42,6 +42,10 @@
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
         </#if>
+         <#if po.classType=='pca'>
+           <!--省市区字段回显插槽-->
+           {{ getAreaTextByCode(text) }}
+         </#if>
        </template>
        </#if>
       </#list>
@ -138,7 +142,7 @@
   */
  async function handleEdit(record: Recordable) {
    registerModal.value.disableSubmit = false;
-    registerModal.value.edit();
+    registerModal.value.edit(record);
  }

  /**
@ -227,7 +231,6 @@
      white-space: nowrap;
    }
    .query-group-cust{
-      width: calc(50% - 15px);
      min-width: 100px !important;
    }
    .query-group-split-cust{
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@ -211,8 +211,8 @@

 <style lang="less" scoped>
  .antd-modal-form {
-    min-height: 500px !important;
+    height: 500px !important;
    overflow-y: auto;
-    padding: 24px 24px 24px 24px;
+    padding: 14px;
  }
 </style>
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
@ -29,7 +29,7 @@
  <#assign hasOnlyValidate = false>
 <template>
  <a-spin :spinning="confirmLoading">
-    <a-form v-bind="formItemLayout" ref="formRef">
+    <a-form class="antd-modal-form" v-bind="formItemLayout" ref="formRef">
      <a-row>
        <#list sub.colums as po>
          <#if po.isShow == 'Y' && po.fieldValidType?default("") == 'only'>
@ -186,9 +186,9 @@

 <style lang="less" scoped>
  .antd-modal-form {
-    min-height: 500px !important;
+    height: 500px !important;
    overflow-y: auto;
-    padding: 24px 24px 24px 24px;
+    padding: 14px;
  }
 </style>
 </#list>
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@ -51,6 +51,8 @@
                <Icon icon="mdi:chevron-down"></Icon>
              </a-button>
        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
      </template>
       <!--操作栏-->
      <template #action="{ record }">
@ -85,7 +87,7 @@
 </template>

 <script lang="ts" name="${entityPackage}-${entityName?uncap_first}" setup>
-  import {ref, computed, unref} from 'vue';
+  import {ref, reactive, computed, unref} from 'vue';
  import {BasicTable, useTable, TableAction} from '/@/components/Table';
  import { useListPage } from '/@/hooks/system/useListPage'
  import {useModal} from '/@/components/Modal';
@ -93,7 +95,7 @@
  <#list subTables as sub>
  import ${sub.entityName}SubTable from './subTables/${sub.entityName}SubTable.vue'
  </#list>
-  import {columns, searchFormSchema} from './${entityName}.data';
+  import {columns, searchFormSchema, superQuerySchema} from './${entityName}.data';
  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
  import {downloadFile} from '/@/utils/common/renderUtils';
  <#if list_need_pca>
@ -108,6 +110,7 @@
  import { startProcess } from '/@/api/common/api';
  </#if>
  import { useUserStore } from '/@/store/modules/user';
+  const queryParam = reactive<any>({});
   // 展开key
  const expandedRowKeys = ref<any[]>([]);
  //注册model
@ -154,10 +157,14 @@
               width: 120,
               fixed:'right'
           },
+           beforeFetch: (params) => {
+             return Object.assign(params, queryParam);
+           },
        },
        exportConfig: {
            name:"${tableVo.ftlDescription}",
            url: getExportUrl,
+            params: queryParam,
        },
        importConfig: {
            url: getImportUrl,
@ -166,18 +173,33 @@
    })

  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
-   /**
-     * 展开事件
-     * */
-   function handleExpand(expanded, record){
-        expandedRowKeys.value=[];
-        if (expanded === true) {
-           expandedRowKeys.value.push(record.id)
-        }
-    }
-   /**
-    * 新增事件
-    */
+
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+  * 高级查询事件
+  */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
+  /**
+   * 展开事件
+   */
+  function handleExpand(expanded, record){
+      expandedRowKeys.value=[];
+      if (expanded === true) {
+         expandedRowKeys.value.push(record.id)
+      }
+  }
+  /**
+   * 新增事件
+   */
  function handleAdd() {
     openModal(true, {
       isUpdate: false,
@ -264,6 +286,7 @@
        popConfirm: {
          title: '是否确认删除',
          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
        }
      }
    ];
@ -273,6 +296,7 @@
        popConfirm: {
          title: '确认提交流程吗？',
          confirm: handleProcess.bind(null, record),
+          placement: 'topLeft',
        }
      })
    }
@ -287,6 +311,7 @@
        popConfirm: {
          title: '是否确认删除',
          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
        }
      }
    ]
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@ -243,8 +243,13 @@ export const formSchema: FormSchema[] = [
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
@ -508,8 +513,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
@ -794,6 +804,29 @@ export const ${sub.entityName?uncap_first}JVxeColumns: JVxeColumn[] = [
 </#if>
 </#list>

+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+  //子表高级查询
+  <#list subTables as sub>
+  ${sub.entityName?uncap_first}: {
+    title: '${sub.ftlDescription}',
+    view: 'table',
+    fields: {
+      <#list sub.colums as subCol>
+        <#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
+        ${superQueryFieldListForVue3(subCol,subCol_index)},
+        </#if>
+      </#list>
+    }
+  },
+  </#list>
+};
+
 /**
 * 流程表单调用这个方法获取formSchema
 * @param param
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@ -37,6 +37,8 @@
                <Icon icon="mdi:chevron-down"></Icon>
              </a-button>
        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
      </template>
       <!--操作栏-->
      <template #action="{ record }">
@ -71,12 +73,12 @@
 </template>

 <script lang="ts" name="${entityPackage}-${entityName?uncap_first}" setup>
-  import {ref, computed, unref} from 'vue';
+  import {ref, reactive, computed, unref} from 'vue';
  import {BasicTable, useTable, TableAction} from '/@/components/Table';
  import { useListPage } from '/@/hooks/system/useListPage'
  import {useModal} from '/@/components/Modal';
  import ${entityName}Modal from './components/${entityName}Modal.vue'
-  import {columns, searchFormSchema} from './${entityName}.data';
+  import {columns, searchFormSchema, superQuerySchema} from './${entityName}.data';
  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
  import {downloadFile} from '/@/utils/common/renderUtils';
  import { useUserStore } from '/@/store/modules/user';
@ -91,6 +93,7 @@
  <#if bpm_flag==true>
  import { startProcess } from '/@/api/common/api';
  </#if>
+  const queryParam = reactive<any>({});
  const checkedKeys = ref<Array<string | number>>([]);
  const userStore = useUserStore();
  //注册model
@ -136,10 +139,14 @@
               width: 120,
               fixed:'right'
           },
+           beforeFetch: (params) => {
+             return Object.assign(params, queryParam);
+           },
        },
        exportConfig: {
            name:"${tableVo.ftlDescription}",
            url: getExportUrl,
+            params: queryParam,
        },
        importConfig: {
            url: getImportUrl,
@ -149,6 +156,19 @@

  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext

+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
   /**
    * 新增事件
    */
@ -238,6 +258,7 @@
        popConfirm: {
          title: '是否确认删除',
          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
        }
      }
    ];
@ -247,6 +268,7 @@
        popConfirm: {
          title: '确认提交流程吗？',
          confirm: handleProcess.bind(null, record),
+          placement: 'topLeft',
        }
      })
    }
@ -261,6 +283,7 @@
        popConfirm: {
          title: '是否确认删除',
          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
        }
      }
    ]
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@ -243,8 +243,13 @@ export const formSchema: FormSchema[] = [
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
@ -448,11 +453,16 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
    componentProps:{
        dictCode:"${form_field_dictCode}"
-     }
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
    <#elseif po.classType=='sel_search'>
    component: 'JSearchSelect',
    componentProps:{
@ -735,6 +745,30 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
 </#list>


+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+  //子表高级查询
+  <#list subTables as sub>
+  ${sub.entityName?uncap_first}: {
+    title: '${sub.ftlDescription}',
+    view: 'table',
+    fields: {
+      <#list sub.colums as subCol>
+        <#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
+        ${superQueryFieldListForVue3(subCol,subCol_index)},
+        </#if>
+      </#list>
+    }
+  },
+  </#list>
+};
+
+
 /**
 * 流程表单调用这个方法获取formSchema
 * @param param
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@ -105,6 +105,8 @@
                <Icon icon="mdi:chevron-down"></Icon>
              </a-button>
        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
      </template>
       <!--操作栏-->
      <template #action="{ record }">
@ -144,7 +146,7 @@
  import { useListPage } from '/@/hooks/system/useListPage'
  import {useModal} from '/@/components/Modal';
  import ${entityName}Modal from './components/${entityName}Modal.vue'
-  import {columns, searchFormSchema} from './${entityName}.data';
+  import {columns, searchFormSchema, superQuerySchema} from './${entityName}.data';
  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
  import {downloadFile} from '/@/utils/common/renderUtils';
  <#include "/common/form/native/vue3NativeImport.ftl">
@ -195,6 +197,19 @@

  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext

+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
   /**
    * 新增事件
    */
@ -276,6 +291,7 @@
           popConfirm: {
             title: '确认提交流程吗？',
             confirm: handleProcess.bind(null, record),
+             placement: 'topLeft',
           }
         })
       }
@ -290,6 +306,7 @@
           popConfirm: {
             title: '是否确认删除',
             confirm: handleDelete.bind(null, record),
+             placement: 'topLeft',
           }
         }
       ]
@ -374,13 +391,13 @@
  }
  </#if>

-  <#if need_pca>
+  <#if need_pca || need_dept_user>
  /**
-   * 省市区点击事件
+   * form点击事件(以逗号分割)
   * @param key
   * @param value
   */
-  function handleAreaChange(key, value) {
+  function handleFormJoinChange(key, value) {
    queryParam[key] = value.join(',');
  }
  </#if>
@ -394,7 +411,6 @@
    white-space: nowrap;
  }
  .query-group-cust{
-    width: calc(50% - 15px);
    min-width: 100px !important;
  }
  .query-group-split-cust{
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
@ -229,8 +229,13 @@ export const formSchema: FormSchema[] = [
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
@ -425,11 +430,16 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
    componentProps:{
        dictCode:"${form_field_dictCode}"
-     }
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
    <#elseif po.classType=='sel_search'>
    component: 'JSearchSelect',
    componentProps:{
@ -709,4 +719,27 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
 <#-- 循环子表的列 结束 -->
  ]
 </#if>
-</#list>
+</#list>
+
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+  //子表高级查询
+  <#list subTables as sub>
+  ${sub.entityName?uncap_first}: {
+    title: '${sub.ftlDescription}',
+    view: 'table',
+    fields: {
+      <#list sub.colums as subCol>
+        <#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
+        ${superQueryFieldListForVue3(subCol,subCol_index)},
+        </#if>
+      </#list>
+    }
+  },
+  </#list>
+};
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
@ -37,6 +37,8 @@
                <Icon icon="mdi:chevron-down"></Icon>
              </a-button>
        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
      </template>
       <!--操作栏-->
      <template #action="{ record }">
@ -71,12 +73,12 @@
 </template>

 <script lang="ts" name="${entityPackage}-${entityName?uncap_first}" setup>
-  import {ref, computed, unref} from 'vue';
+  import {ref, reactive, computed, unref} from 'vue';
  import {BasicTable, useTable, TableAction} from '/@/components/Table';
  import { useListPage } from '/@/hooks/system/useListPage'
  import {useModal} from '/@/components/Modal';
  import ${entityName}Modal from './components/${entityName}Modal.vue'
-  import {columns, searchFormSchema} from './${entityName}.data';
+  import {columns, searchFormSchema, superQuerySchema} from './${entityName}.data';
  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './${entityName}.api';
  import {downloadFile} from '/@/utils/common/renderUtils';
  import { useUserStore } from '/@/store/modules/user';
@ -91,6 +93,7 @@
  <#if bpm_flag==true>
  import { startProcess } from '/@/api/common/api';
  </#if>
+  const queryParam = reactive<any>({});
  const userStore = useUserStore();
  const checkedKeys = ref<Array<string | number>>([]);
  //注册model
@ -136,10 +139,14 @@
               width: 120,
               fixed:'right'
           },
+           beforeFetch: (params) => {
+             return Object.assign(params, queryParam);
+           },
        },
        exportConfig: {
            name:"${tableVo.ftlDescription}",
            url: getExportUrl,
+            params: queryParam,
        },
        importConfig: {
            url: getImportUrl,
@ -149,6 +156,19 @@

  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext

+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
   /**
    * 新增事件
    */
@ -238,6 +258,7 @@
        popConfirm: {
          title: '是否确认删除',
          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
        }
      }
    ];
@ -247,6 +268,7 @@
        popConfirm: {
          title: '确认提交流程吗？',
          confirm: handleProcess.bind(null, record),
+          placement: 'topLeft',
        }
      })
    }
@ -261,6 +283,7 @@
        popConfirm: {
          title: '是否确认删除',
          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
        }
      }
    ]
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@ -240,8 +240,13 @@ export const formSchema: FormSchema[] = [
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
@ -442,8 +447,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
    component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
    componentProps:{
        dictCode:"${form_field_dictCode}"
     },
@ -726,4 +736,28 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [
 <#-- 循环子表的列 结束 -->
  ]
 </#if>
-</#list>
+</#list>
+
+
+// 高级查询数据
+export const superQuerySchema = {
+  <#list columns as po>
+  <#if po.isShowList =='Y' && po.fieldName !='id'>
+  ${superQueryFieldListForVue3(po,po_index)},
+  </#if>
+  </#list>
+  //子表高级查询
+  <#list subTables as sub>
+  ${sub.entityName?uncap_first}: {
+    title: '${sub.ftlDescription}',
+    view: 'table',
+    fields: {
+      <#list sub.colums as subCol>
+        <#if subCol.isShowList =='Y' && subCol.fieldName !='id'>
+        ${superQueryFieldListForVue3(subCol,subCol_index)},
+        </#if>
+      </#list>
+    }
+  },
+  </#list>
+};
--- a/jeecg-module-system/jeecg-system-start/Dockerfile
+++ b/jeecg-module-system/jeecg-system-start/Dockerfile
@ -11,6 +11,6 @@ WORKDIR /jeecg-boot
 EXPOSE 8080

 #ADD ./src/main/resources/jeecg ./config/jeecg
-ADD ./target/jeecg-system-start-3.6.0.jar ./
+ADD ./target/jeecg-system-start-3.6.1.jar ./

-CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.6.0.jar
+CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-start-3.6.1.jar
--- a/jeecg-module-system/jeecg-system-start/pom.xml
+++ b/jeecg-module-system/jeecg-system-start/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-module-system</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt
+++ b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt
@ -9,6 +9,9 @@ ${AnsiColor.BRIGHT_BLUE}


 ${AnsiColor.BRIGHT_GREEN}
-Jeecg  Boot Version: 3.6.0
+Jeecg  Boot Version: 3.6.1
 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
+产品官网： www.jeecg.com
+版权所属： 北京国炬信息技术有限公司
+公司官网： www.guojusoft.com
 ${AnsiColor.BLACK}
--- a/jeecg-module-system/pom.xml
+++ b/jeecg-module-system/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-boot-parent</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/jeecg-server-cloud/docker-compose-base.yml
+++ b/jeecg-server-cloud/docker-compose-base.yml
@ -18,6 +18,8 @@ services:
      --default-authentication-plugin=caching_sha2_password
    ports:
      - 3306:3306
+    networks:
+      - jeecg-boot

  jeecg-boot-redis:
    image: redis:5.0
@ -26,6 +28,13 @@ services:
    restart: always
    container_name: jeecg-boot-redis
    hostname: jeecg-boot-redis
+    networks:
+      - jeecg-boot
+
+
+networks:
+  jeecg-boot:
+    name: jeecg_boot

 #  jeecg-boot-rabbitmq:
 #    image: rabbitmq:3.7.7-management
--- a/jeecg-server-cloud/docker-compose.yml
+++ b/jeecg-server-cloud/docker-compose.yml
@ -8,6 +8,8 @@ services:
      - 8848:8848
    container_name: jeecg-boot-nacos
    hostname: jeecg-boot-nacos
+    networks:
+      - jeecg-boot

  jeecg-boot-system:
    depends_on:
@ -19,6 +21,8 @@ services:
    restart: on-failure
    environment:
      - TZ=Asia/Shanghai
+    networks:
+      - jeecg-boot

  jeecg-boot-demo:
    depends_on:
@ -30,6 +34,8 @@ services:
    restart: on-failure
    environment:
      - TZ=Asia/Shanghai
+    networks:
+      - jeecg-boot

  jeecg-boot-gateway:
    restart: on-failure
@ -42,6 +48,12 @@ services:
      - jeecg-boot-system
    container_name: jeecg-boot-gateway
    hostname: jeecg-boot-gateway
+    networks:
+      - jeecg-boot
+
+networks:
+  jeecg-boot:
+    name: jeecg_boot

 #  jeecg-boot-sentinel:
 #    restart: on-failure
--- a/jeecg-server-cloud/jeecg-cloud-gateway/Dockerfile
+++ b/jeecg-server-cloud/jeecg-cloud-gateway/Dockerfile
@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-gateway

 EXPOSE 9999

-ADD ./target/jeecg-cloud-gateway-3.6.0.jar ./
+ADD ./target/jeecg-cloud-gateway-3.6.1.jar ./

-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.6.0.jar
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.6.1.jar
--- a/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml
+++ b/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-server-cloud</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>jeecg-cloud-gateway</artifactId>
--- a/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile
+++ b/jeecg-server-cloud/jeecg-cloud-nacos/Dockerfile
@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-nacos

 EXPOSE 8848

-ADD ./target/jeecg-cloud-nacos-3.6.0.jar ./
+ADD ./target/jeecg-cloud-nacos-3.6.1.jar ./

-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.6.0.jar
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.6.1.jar
--- a/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml
+++ b/jeecg-server-cloud/jeecg-cloud-nacos/pom.xml
@ -5,7 +5,7 @@
    <artifactId>jeecg-cloud-nacos</artifactId>
    <name>jeecg-cloud-nacos</name>
    <description>nacos启动模块</description>
-    <version>3.6.0</version>
+    <version>3.6.1</version>

    <parent>
        <groupId>org.springframework.boot</groupId>
--- a/jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfile
+++ b/jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfile
@ -10,6 +10,6 @@ WORKDIR /jeecg-demo-cloud

 EXPOSE 7002

-ADD ./target/jeecg-demo-cloud-start-3.6.0.jar ./
+ADD ./target/jeecg-demo-cloud-start-3.6.1.jar ./

-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-demo-cloud-start-3.6.0.jar
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-demo-cloud-start-3.6.1.jar
--- a/jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml
+++ b/jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-server-cloud</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/jeecg-server-cloud/jeecg-system-cloud-start/Dockerfile
+++ b/jeecg-server-cloud/jeecg-system-cloud-start/Dockerfile
@ -10,6 +10,6 @@ WORKDIR /jeecg-system-cloud

 EXPOSE 7001

-ADD ./target/jeecg-system-cloud-start-3.6.0.jar ./
+ADD ./target/jeecg-system-cloud-start-3.6.1.jar ./

-CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.6.0.jar
+CMD sleep 1;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.6.1.jar
--- a/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml
+++ b/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-server-cloud</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>jeecg-system-cloud-start</artifactId>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-visual</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>jeecg-cloud-monitor</artifactId>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/Dockerfile
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/Dockerfile
@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-sentinel

 EXPOSE 8848

-ADD ./target/jeecg-cloud-sentinel-3.6.0.jar ./
+ADD ./target/jeecg-cloud-sentinel-3.6.1.jar ./

-CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-sentinel-3.6.0.jar
+CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-sentinel-3.6.1.jar
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-visual</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <artifactId>jeecg-cloud-sentinel</artifactId>
    <name>jeecg-cloud-sentinel</name>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/JeecgSentinelApplication.java
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/JeecgSentinelApplication.java
@ -36,6 +36,9 @@ public class JeecgSentinelApplication {
        triggerSentinelInit();
        ConfigurableApplicationContext application = SpringApplication.run(JeecgSentinelApplication.class, args);
        Environment env = application.getEnvironment();
+        // 目前jeecg-sentinel 1.8.3 版本存在alibaba-sentinel 1.8.3版本 启动nacos数据源导致配置不生效的问题，以下为临时处理办法
+        System.getProperties().setProperty("sentinel.dashboard.auth.username", env.getProperty("sentinel.dashboard.auth.username"));
+        System.getProperties().setProperty("sentinel.dashboard.auth.password", env.getProperty("sentinel.dashboard.auth.password"));
        String port = env.getProperty("server.port");
        log.info("\n----------------------------------------------------------\n\t" +
                "Application SentinelDashboard is running! Access URLs:\n\t" +
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/resources/application.yml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/src/main/resources/application.yml
@ -18,8 +18,6 @@ auth:
  filter:
    exclude-url-suffixes: htm,html,js,css,map,ico,ttf,woff,png
    exclude-urls: /,/auth/login,/auth/logout,/registry/machine,/version
-  password: sentinel
-  username: sentinel
 logging:
  level:
    org:
@ -34,4 +32,7 @@ nacos:
    ip: @config.server-addr@
 sentinel:
  dashboard:
-    version: 1.8.2
+    version: 1.8.2
+    auth:
+      username: sentinel
+      password: sentinel
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-cloud-test</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <description>公共测试模块</description>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-cloud-test</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <description>消息队列测试模块</description>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-cloud-test-seata</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <description>分布式事务测试模块</description>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-cloud-test-seata</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <description>分布式事务测试模块</description>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-cloud-test-seata</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <description>分布式事务测试模块</description>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-cloud-test</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>jeecg-cloud-test-seata</artifactId>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-cloud-test</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-visual</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/Dockerfile
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/Dockerfile
@ -10,7 +10,7 @@ WORKDIR /jeecg-cloud-xxljob

 EXPOSE 9080

-ADD ./target/jeecg-cloud-xxljob-3.6.0.jar ./
+ADD ./target/jeecg-cloud-xxljob-3.6.1.jar ./

-CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.6.0.jar
+CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.6.1.jar

--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-visual</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/jeecg-server-cloud/jeecg-visual/pom.xml
+++ b/jeecg-server-cloud/jeecg-visual/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-server-cloud</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/jeecg-server-cloud/pom.xml
+++ b/jeecg-server-cloud/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jeecg-boot-parent</artifactId>
        <groupId>org.jeecgframework.boot</groupId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/pom.xml
+++ b/pom.xml
@ -2,7 +2,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.jeecgframework.boot</groupId>
  <artifactId>jeecg-boot-parent</artifactId>
-  <version>3.6.0</version>
+  <version>3.6.1</version>
  <packaging>pom</packaging>
  <name>JEECG BOOT ${project.version} </name>

@ -10,6 +10,7 @@
 		<developer>
 			<name>北京国炬信息技术有限公司</name>
 			<email>jeecgos@163.com</email>
+			<url>http://www.guojusoft.com</url>
 		</developer>
 	</developers>

@ -27,7 +28,7 @@
 	</parent>

 	<properties>
-		<jeecgboot.version>3.6.0</jeecgboot.version>
+		<jeecgboot.version>3.6.1</jeecgboot.version>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

@ -46,7 +47,7 @@
 		<ojdbc6.version>11.2.0.3</ojdbc6.version>
 		<sqljdbc4.version>4.0</sqljdbc4.version>
 		<mysql-connector-java.version>8.0.27</mysql-connector-java.version>
-		<hutool.version>5.3.8</hutool.version>
+		<hutool.version>5.8.23</hutool.version>

 		<!-- 持久层 -->
 		<mybatis-plus.version>3.5.3.1</mybatis-plus.version>
@ -55,7 +56,7 @@
 		<minidao.version>1.9.5</minidao.version>

 		<!-- 积木报表-->
-		<jimureport-spring-boot-starter.version>1.6.4</jimureport-spring-boot-starter.version>
+		<jimureport-spring-boot-starter.version>1.6.6</jimureport-spring-boot-starter.version>
 		<commons.version>2.6</commons.version>
 		<aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
 		<aliyun.oss.version>3.11.2</aliyun.oss.version>
@ -64,7 +65,7 @@
 		<java-jwt.version>3.11.0</java-jwt.version>
 		<shiro-redis.version>3.2.2</shiro-redis.version>
 		<codegenerate.version>1.4.4</codegenerate.version>
-		<autopoi-web.version>1.4.6</autopoi-web.version>
+		<autopoi-web.version>1.4.7</autopoi-web.version>
 		<minio.version>8.0.3</minio.version>
 		<justauth-spring-boot-starter.version>1.3.4</justauth-spring-boot-starter.version>
 		<dom4j.version>1.6.1</dom4j.version>
@ -243,7 +244,7 @@
 			<dependency>
 				<groupId>org.jeecgframework.boot</groupId>
 				<artifactId>hibernate-re</artifactId>
-				<version>3.5.3</version>
+				<version>3.6.1</version>
 			</dependency>

 			<!--mongon db-->
@ -252,7 +253,24 @@
 				<artifactId>jeecg-boot-starter-mongon</artifactId>
 				<version>${jeecgboot.version}</version>
 			</dependency>
-
+			<!--人大金仓驱动 版本号V008R006C005B0013 -->
+			<dependency>
+				<groupId>org.jeecgframework</groupId>
+				<artifactId>kingbase8</artifactId>
+				<version>9.0.0</version>
+				<scope>runtime</scope>
+			</dependency>
+			<!--达梦8数据库最新驱动 版本号1-3-26-2023.07.26-197096-20046-ENT -->
+			<dependency>
+				<groupId>com.dameng</groupId>
+				<artifactId>Dm8JdbcDriver18</artifactId>
+				<version>8.1.1.49</version>
+			</dependency>
+			<dependency>
+				<groupId>com.dameng</groupId>
+				<artifactId>DmDialect-for-hibernate5.0</artifactId>
+				<version>8.1.1.49</version>
+			</dependency>
 			<!-- 七牛云SDK -->
 			<dependency>
 				<groupId>com.qiniu</groupId>
@ -305,6 +323,17 @@
 				<artifactId>okhttp</artifactId>
 				<version>4.4.1</version>
 			</dependency>
+			<!-- hutool工具类-->
+			<dependency>
+				<groupId>cn.hutool</groupId>
+				<artifactId>hutool-core</artifactId>
+				<version>${hutool.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>cn.hutool</groupId>
+				<artifactId>hutool-crypto</artifactId>
+				<version>${hutool.version}</version>
+			</dependency>
 			<!--minio-->
 			<dependency>
 				<groupId>io.minio</groupId>
Author	SHA1	Message	Date
JEECG	337d5a9489	Merge pull request #5692 from hoperunChen/fix-QQYUN-7527 fix QQYUN-7527 vue3代码生成默认带上高级查询	2023-12-26 14:35:56 +08:00
JEECG	6d1094936b	Merge pull request #5691 from hoperunChen/Fix-QQYUN-7583 fix QQYUN-7583 Vue3风格表单页面多选控件渲染成了下拉多选	2023-12-26 14:00:59 +08:00
JEECG	8836a2793a	Merge pull request #5690 from hoperunChen/fix-issues-#5658 fix issues #5658 树表复选框与展开按钮重叠问题	2023-12-26 13:59:52 +08:00
zhangdaiscott	c36ece8923	补充信息	2023-12-23 19:24:15 +08:00
zhangdaiscott	a82213b90c	还原错误提交	2023-12-21 15:47:28 +08:00
zhangdaiscott	98facdd2ee	Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot.git	2023-12-21 15:45:21 +08:00
zhangdaiscott	d080b0b5ea	SpringBoot3+JDK17版本可以下载了	2023-12-21 15:36:09 +08:00
JEECG	338902ca0c	Merge pull request #5706 from hoperunChen/fix-issue-vue3-#939 fix issue vue3 #939 npm run build 失败	2023-12-21 14:59:56 +08:00
chenrui	7ae6a11cf0	fix issue vue3 #939 : modify file suffix	2023-12-21 14:31:51 +08:00
chenrui	cdbe1cb1a9	fix issue vue3 #939	2023-12-21 13:31:04 +08:00
zhangdaiscott	232037ec58	1	2023-12-20 16:26:51 +08:00
zhangdaiscott	b18c1120ab	流程引擎推荐	2023-12-20 16:25:45 +08:00
zhangdaiscott	f6a7831963	1	2023-12-20 15:16:41 +08:00
zhangdaiscott	08a4473bbc	1	2023-12-20 15:12:14 +08:00
zhangdaiscott	9008ddafa4	1	2023-12-20 15:10:59 +08:00
zhangdaiscott	7012ed4c2c	流程引擎	2023-12-20 15:08:54 +08:00
zhangdaiscott	1d8c8c30d0	升级hutool版本号，解决hutool漏洞问题 CVE-2023-42278、CVE-2023-42277、CVE-2023-42276、CVE-2023-33695、CVE-2023-3276、CVE-2022-4565	2023-12-20 11:09:40 +08:00
chenrui	090f790df4	fix QQYUN-7527 vue3代码生成,默认带上高级查询	2023-12-19 11:06:05 +08:00
chenrui	82d051f388	fix QQYUN-7583 Vue3风格表单页面多选控件渲染成了下拉多选	2023-12-19 11:05:16 +08:00
chenrui	5a3631c332	fix issues #5658 树表复选框与展开按钮重叠问题	2023-12-19 11:03:18 +08:00
zhangdaiscott	c00b5526c3	解决3.6.1版本添加online报表报错Subject does not have permission [online:report:add] #5672	2023-12-16 10:42:24 +08:00
zhangdaiscott	2e35abd3a3	大龄码农的思考	2023-12-15 13:57:51 +08:00
zhangdaiscott	9bc3f6c56e	源码下载说明	2023-12-15 13:53:42 +08:00
zhangdaiscott	5588912b62	分支说明	2023-12-15 13:43:06 +08:00
zhangdaiscott	37cf913d6d	springboot3分支	2023-12-14 11:57:48 +08:00
zhangdaiscott	94ba767090	SpringBoot3(JDK17)版本介绍	2023-12-14 11:54:44 +08:00
JEECG	a406c7cd81	Merge pull request #5659 from EightMonth/master 修改docker-compose文件添加network配置	2023-12-12 17:49:27 +08:00
kezhijie	480878a3db	修改docker-compose文件添加network配置	2023-12-12 17:43:54 +08:00
JEECG	a85499119d	Merge pull request #5605 from EightMonth/master 修复 #5556 sentinel配置文件修改账号密码，logging.level.pattern 等配置无效！ #5556 shiro集成 redis 不支持 sentinel 方式部署的redis集群 #5569	2023-12-12 16:23:32 +08:00
zhangdaiscott	4cbe9cad8e	字典code解码失败，可能是使用了非法字符，请检查！ #5655	2023-12-12 10:50:42 +08:00
zhangdaiscott	2dfc06c679	3.6.1 新版oracle脚本	2023-12-11 10:10:14 +08:00
zhangdaiscott	a591ad9fed	人大金仓和达梦数据库驱动	2023-12-11 10:06:07 +08:00
zhangdaiscott	5420e69b59	3.6.0到3.6.1升级sql	2023-12-11 09:58:04 +08:00
zhangdaiscott	f157c96f65	JeecgBoot 3.6.1版本发布——ONLINE专题版本	2023-12-10 11:16:50 +08:00
zhangdaiscott	9588ace87f	企业微信域名文件认证万能接口	2023-12-08 17:06:42 +08:00
zhangdaiscott	cc57ac379b	JeecgBoot 3.6.1版本发布——ONLINE专题版本	2023-12-07 12:04:58 +08:00
zhangdaiscott	074920552a	JeecgBoot 3.6.1版本发布——ONLINE专题版本	2023-12-07 12:01:14 +08:00
zhangdaiscott	2a00a24058	升级online到3.6.0版本（注意有升级sql）	2023-12-07 11:13:17 +08:00
kezhijie	06cc4ec0fe	Update docker-compose.yml	2023-12-05 18:24:09 +08:00
kezhijie	decea393a5	移除更新格式化内容	2023-12-05 10:13:29 +08:00
kezhijie	65b0fab80d	移除格式化更新	2023-12-05 10:09:14 +08:00
kezhijie	1d4098ae14	修复 #5569	2023-12-04 20:02:30 +08:00
kezhijie	5c4f303a0d	Merge branch 'master' of https://github.com/EightMonth/jeecg-boot	2023-11-23 13:53:54 +08:00
kezhijie	8dcc5bdf8a	修复 #5556	2023-11-23 13:50:07 +08:00
zhangdaiscott	b3e4a73a34	【QQYUN-7028】用户职务保存后未回显	2023-11-20 11:22:32 +08:00
zhangdaiscott	60b4a038f6	查询地域组件更换	2023-11-16 17:56:41 +08:00
zhangdaiscott	4e3738100a	vue3版本支持uniapp的代码生成	2023-11-16 17:56:27 +08:00
zhangdaiscott	8216889078	优化代码生成器模板	2023-11-15 10:38:18 +08:00
zhangdaiscott	6ab4ee6a91	维护用户租户关系有问题	2023-11-05 11:36:53 +08:00
zhangdaiscott	a8dde73a8c	生成代码模版的删除按钮弹窗的确认、取消显示错位问题	2023-10-30 21:26:26 +08:00
zhangdaiscott	b2b11611c1	群满了，增加新QQ群⑧825232878	2023-10-26 17:14:00 +08:00