Merge remote-tracking branch 'origin/test' into test

sql/Online.sql

@@ -1,20 +0,0 @@
---  add by hy   2024-04-27 添加 用户系统树权限关联表
-DROP TABLE IF EXISTS `sys_user_tree_showlevel`;
-CREATE TABLE `sys_user_tree_showlevel`  (
-                                            `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-                                            `user_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                            `show_level` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                            `create_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-                                            `create_time` datetime(0) NULL DEFAULT NULL,
-                                            PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
--- 创建密码管理表
-CREATE TABLE `sys_password` (
-                                `id` bigint NOT NULL AUTO_INCREMENT,
-                                `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '类型',
-                                `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '功能描述',
-                                `password` varchar(100) CHARACTER SET utf8mb3 DEFAULT NULL COMMENT '密码',
-                                `salt` varchar(100) CHARACTER SET utf8mb3 DEFAULT NULL COMMENT '盐',
-                                PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1787760730510000129 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='机构密码';

src/main/java/com/ydtech/constants/sys/SystemConstant.java

@@ -11,11 +11,6 @@ public class SystemConstant {
 
     protected static final String[] SYS_ROLE_TEAM_LEADER = {
             RoleConstants.R01.getCode(),
-            RoleConstants.R15.getCode(),
-            RoleConstants.R16.getCode(),
-            RoleConstants.R17.getCode(),
-            RoleConstants.R18.getCode(),
-            RoleConstants.R21.getCode()
     };
 
     public static String[] getSysRoleTeamLeader(){

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -264,7 +264,7 @@
         ins_fee_order_new a
         LEFT JOIN ins_area_company iac on iac.id=a.ins_order_no
         WHERE
-        a.id NOT IN (
+        a.ins_order_no NOT IN (
         SELECT
         ins_order_no
         FROM
@@ -293,7 +293,7 @@
         ins_fee_order_new a
         LEFT JOIN ins_area_company iac on iac.id=a.ins_order_no
         WHERE
-        a.id NOT IN (
+        a.ins_order_no NOT IN (
         SELECT
         ins_order_no
         FROM
@@ -323,7 +323,7 @@
         ins_fee_order_new a
         LEFT JOIN ins_area_company iac on iac.id=a.ins_order_no
         WHERE
-        a.id NOT IN (
+        a.ins_order_no NOT IN (
         SELECT
         ins_order_no
         FROM