diff --git a/mhd-modules/mhd-system/pom.xml b/mhd-modules/mhd-system/pom.xml
index 28390c606..923472867 100644
--- a/mhd-modules/mhd-system/pom.xml
+++ b/mhd-modules/mhd-system/pom.xml
@@ -54,9 +54,14 @@
-
+
+
+ com.dameng
+ DmJdbcDriver18
+ 8.1.1.193
diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCityMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCityMapper.xml
index 91f01d07c..284040ffe 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCityMapper.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCityMapper.xml
@@ -17,7 +17,7 @@
a.update_by,
a.update_by_name,
a.del_flag
- FROM `sys_city` a
+ FROM sys_city a
WHERE a.del_flag = 1
@@ -43,7 +43,7 @@
a.update_by,
a.update_by_name,
a.del_flag
- FROM `sys_city` a
+ FROM sys_city a
WHERE a.del_flag = 1
@@ -71,7 +71,7 @@
city_name,
city_remark
FROM
- `sys_city`
+ sys_city
WHERE
province_code = #{values}
ORDER BY
diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCountyMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCountyMapper.xml
index 90cb542f0..deec9ee50 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCountyMapper.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCountyMapper.xml
@@ -17,7 +17,7 @@
a.update_by,
a.update_by_name,
a.del_flag
- FROM `sys_county` a
+ FROM sys_county a
WHERE a.del_flag = 1
@@ -43,7 +43,7 @@
a.update_by_name,
a.del_flag
FROM
- `sys_county` a
+ sys_county a
WHERE
a.del_flag = 1
@@ -68,7 +68,7 @@
city_code,
county_name,
county_remark
- FROM `sys_county`
+ FROM sys_county
WHERE city_code = #{values}
ORDER BY county_code_new DESC LIMIT 1
@@ -113,7 +113,7 @@
a.county_name as countyName,
CONCAT( c.province_name, b.city_name, a.county_name ) AS provinceCityCountyName
FROM
- `sys_county` a
+ sys_county a
LEFT JOIN sys_city b ON a.city_code = b.city_code
LEFT JOIN sys_province c ON b.province_code = c.province_code
WHERE
diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml
index 6868c63fa..cfb0ac7cd 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml
@@ -15,7 +15,7 @@
a.update_by,
a.update_by_name,
a.del_flag
- FROM `sys_province` a
+ FROM sys_province a
WHERE a.del_flag = 1
@@ -41,7 +41,7 @@
a.update_by,
a.update_by_name,
a.del_flag
- FROM `sys_province` a
+ FROM sys_province a
WHERE a.del_flag = 1
@@ -75,7 +75,7 @@
c.update_by_name,
c.del_flag
FROM
- `sys_county` a
+ sys_county a
LEFT JOIN sys_city b ON a.city_code = b.city_code
LEFT JOIN sys_province c ON b.province_code = c.province_code
UNION
@@ -94,7 +94,7 @@
b.update_by_name,
b.del_flag
FROM
- `sys_county` a
+ sys_county a
LEFT JOIN sys_city b ON a.city_code = b.city_code
LEFT JOIN sys_province c ON b.province_code = c.province_code
UNION
@@ -113,7 +113,7 @@
a.update_by_name,
a.del_flag
FROM
- `sys_county` a
+ sys_county a
LEFT JOIN sys_city b ON a.city_code = b.city_code
LEFT JOIN sys_province c ON b.province_code = c.province_code
) a
@@ -147,7 +147,7 @@
c.update_by_name,
c.del_flag
FROM
- `sys_county` a
+ sys_county a
LEFT JOIN sys_city b ON a.city_code = b.city_code
LEFT JOIN sys_province c ON b.province_code = c.province_code
@@ -178,7 +178,7 @@
b.update_by_name,
b.del_flag
FROM
- `sys_county` a
+ sys_county a
LEFT JOIN sys_city b ON a.city_code = b.city_code
LEFT JOIN sys_province c ON b.province_code = c.province_code
WHERE
@@ -208,7 +208,7 @@
a.update_by_name,
a.del_flag
FROM
- `sys_county` a
+ sys_county a
LEFT JOIN sys_city b ON a.city_code = b.city_code
LEFT JOIN sys_province c ON b.province_code = c.province_code
WHERE
@@ -245,7 +245,7 @@
province_name,
province_remark
FROM
- `sys_province`
+ sys_province
ORDER BY
province_code DESC
LIMIT 1
diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/UserFormConfigInterface.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/UserFormConfigInterface.xml
index da7d67cf7..394836c26 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/UserFormConfigInterface.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/UserFormConfigInterface.xml
@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
a.*
FROM
- `basic_agreement` a
+ basic_agreement a
WHERE
a.del_flag = 1
diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/addressBook/UserFormConfigInterface.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/addressBook/UserFormConfigInterface.xml
index 910d27788..fa1c98742 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/addressBook/UserFormConfigInterface.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/addressBook/UserFormConfigInterface.xml
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ab1.latitude AS receive_doorplate,
ab1.address_plot AS receive_addressPlot
FROM
- `common_route` cr
+ common_route cr
LEFT JOIN
address_book ab
ON ab.address_book_id = cr.send_address_id and ab.user_id = #{userId}
@@ -180,7 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.doorplate,
b.remark
FROM
- `manifest_throught` m
+ manifest_throught m
LEFT JOIN
address_book b
ON m.address_book_id = b.address_book_id
diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml
index 23b958989..67845fb2f 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml
@@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and material_base_info_id in (SELECT
DISTINCT material_base_info_id
- FROM `test_szwl_wms`.material_inventory
+ FROM test_szwl_wms.material_inventory
WHERE
allocation_quantity > 0
AND del_flag = 1)
diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml
index a14aaf78b..31a7e19b6 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select material_classify_id, organization_id, organization_name, top_organization_id, code, `name`, `level`, parent_code, parent_name, code_path, name_path, remark, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from material_classify
+ select material_classify_id, organization_id, organization_name, top_organization_id, code, name, level, parent_code, parent_name, code_path, name_path, remark, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from material_classify
@@ -47,10 +47,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and code = #{code}
- and `name` like concat('%', #{name}, '%')
+ and name like concat('%', #{name}, '%')
- and `level` = #{level}
+ and level = #{level}
and parent_code = #{parentCode}
@@ -93,6 +93,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE
FIND_IN_SET(#{parentCode}, code_path) > 0
- ORDER BY `level` ASC
+ ORDER BY level ASC
\ No newline at end of file
diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocationGroup/StorageLocationGroupMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocationGroup/StorageLocationGroupMapper.xml
index 618e0690c..52ca90bf2 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocationGroup/StorageLocationGroupMapper.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocationGroup/StorageLocationGroupMapper.xml
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and update_by_name like concat('%', #{updateByName}, '%')
- and `number` = #{number}
+ and number = #{number}
and remark like concat('%',#{remark},'%')
diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/system/SysMenuMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/system/SysMenuMapper.xml
index b90bf0cf4..d84fdfae9 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -29,7 +29,7 @@
- select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible,sys_type, status, ifnull(perms,'') as perms, icon, create_time
+ select menu_id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible,sys_type, status, ifnull(perms,'') as perms, icon, create_time
from sys_menu
@@ -54,13 +54,13 @@
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
+
+ com.dameng
+ DmJdbcDriver18
+ 8.1.1.193
diff --git a/mhd_finance/src/main/resources/mapper/accountManage/AccountCashWalletMapper.xml b/mhd_finance/src/main/resources/mapper/accountManage/AccountCashWalletMapper.xml
index 672a7f4ef..8b38b8d55 100644
--- a/mhd_finance/src/main/resources/mapper/accountManage/AccountCashWalletMapper.xml
+++ b/mhd_finance/src/main/resources/mapper/accountManage/AccountCashWalletMapper.xml
@@ -12,9 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
+
+ com.dameng
+ DmJdbcDriver18
+ 8.1.1.193
diff --git a/mhd_product/src/main/resources/mapper/appMenu/AppMenuMapper.xml b/mhd_product/src/main/resources/mapper/appMenu/AppMenuMapper.xml
index 31a715484..abddc0176 100644
--- a/mhd_product/src/main/resources/mapper/appMenu/AppMenuMapper.xml
+++ b/mhd_product/src/main/resources/mapper/appMenu/AppMenuMapper.xml
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
a.app_menu_id, a.app_id, me.modules_id
from app_menu a
- left join `sys_menu` me ON me.menu_id = a.menu_id
+ left join sys_menu me ON me.menu_id = a.menu_id
where
a.del_Flag = 1
and me.del_Flag = 1
@@ -91,8 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
me.menu_show,
me.menu_perms
from app_menu a
- left join `app_config` co ON co.app_id = a.app_id
- left join `sys_menu` me ON me.menu_id = a.menu_id
+ left join app_config co ON co.app_id = a.app_id
+ left join sys_menu me ON me.menu_id = a.menu_id
where
a.del_flag = 1
and me.del_flag = 1
diff --git a/mhd_product/src/main/resources/mapper/appUserMenuSettings/AppUserMenuSettingsMapper.xml b/mhd_product/src/main/resources/mapper/appUserMenuSettings/AppUserMenuSettingsMapper.xml
index 2a25cec46..df01bddfd 100644
--- a/mhd_product/src/main/resources/mapper/appUserMenuSettings/AppUserMenuSettingsMapper.xml
+++ b/mhd_product/src/main/resources/mapper/appUserMenuSettings/AppUserMenuSettingsMapper.xml
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
me.menu_show,
me.menu_perms
from app_user_menu_settings a
- left join `sys_menu` me ON me.menu_id = a.menu_id
+ left join sys_menu me ON me.menu_id = a.menu_id
where
a.del_flag = 1
and me.del_flag = 1
diff --git a/mhd_product/src/main/resources/mapper/customAuth/CustomAuthOrganizationMapper.xml b/mhd_product/src/main/resources/mapper/customAuth/CustomAuthOrganizationMapper.xml
index d4811b8a0..0a1b4db45 100644
--- a/mhd_product/src/main/resources/mapper/customAuth/CustomAuthOrganizationMapper.xml
+++ b/mhd_product/src/main/resources/mapper/customAuth/CustomAuthOrganizationMapper.xml
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
del_flag
FROM
- `custom_auth_organization`
+ custom_auth_organization
diff --git a/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml b/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml
index 3271066b1..5e1dd60a7 100644
--- a/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml
+++ b/mhd_product/src/main/resources/mapper/menu/MenuMapper.xml
@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
me.top_organization_id,
me.home_show_flag
FROM
- `sys_menu` me
+ sys_menu me
LEFT JOIN
sys_modules mo
ON me.modules_id = mo.modules_id
@@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
me.menu_remark,
me.menu_perms
FROM
- `sys_menu` me
+ sys_menu me
LEFT JOIN
sys_modules mo
ON me.modules_id = mo.modules_id
@@ -231,7 +231,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
sys_tenants t
LEFT JOIN
- `tenants_menu` tm
+ tenants_menu tm
ON t.tenants_id = tm.tenants_id
INNER JOIN
sys_menu m
@@ -258,7 +258,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
om.organization_id,
m.modules_id
FROM
- `organization_menu` om
+ organization_menu om
LEFT JOIN
sys_menu m
ON om.menu_id = m.menu_id
@@ -276,7 +276,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
menu_component AS menuComponent,
menu_redirect_path AS menuRedirectPath
FROM
- `sys_menu`
+ sys_menu
where
del_flag = 1
and menu_show = 1
@@ -303,7 +303,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
DISTINCT modules_id
FROM
- `sys_menu`
+ sys_menu
WHERE
del_flag = 1
AND menu_id in
@@ -317,9 +317,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
m.menu_id
FROM
- `sys_menu` m
+ sys_menu m
LEFT JOIN
- `sys_menu` mp
+ sys_menu mp
ON m.parent_menu_id = mp.menu_id
LEFT JOIN
sys_modules mo
@@ -341,7 +341,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
menu_id
FROM
- `sys_menu`
+ sys_menu
WHERE
del_flag = 1
and menu_show = 1
@@ -352,7 +352,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
DISTINCT parent_menu_id
FROM
- `sys_menu`
+ sys_menu
WHERE
parent_menu_id != 0
AND menu_id in
diff --git a/mhd_product/src/main/resources/mapper/modules/ModulesMenuMapper.xml b/mhd_product/src/main/resources/mapper/modules/ModulesMenuMapper.xml
index 1f7188632..fcbdbd277 100644
--- a/mhd_product/src/main/resources/mapper/modules/ModulesMenuMapper.xml
+++ b/mhd_product/src/main/resources/mapper/modules/ModulesMenuMapper.xml
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
del_flag
FROM
- `modules_menu`
+ modules_menu
diff --git a/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml b/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml
index a3fd6cb14..2add4a301 100644
--- a/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml
+++ b/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml
@@ -96,9 +96,9 @@
o1.interbank_number,
o1.template_seal
FROM
- `sys_organization` o1
+ sys_organization o1
LEFT JOIN
- `sys_organization` o2
+ sys_organization o2
ON o1.parent_organization_id = o2.organization_id
@@ -120,7 +120,7 @@
- AND o1.organization_id NOT IN ( SELECT organization_id FROM `sys_organization_correlation` WHERE organization_id = #{organizationId} )
+ AND o1.organization_id NOT IN ( SELECT organization_id FROM sys_organization_correlation WHERE organization_id = #{organizationId} )
order by o1.create_time desc
@@ -134,7 +134,7 @@
SELECT
organization_id
FROM
- `sys_organization`
+ sys_organization
where tenants_id = #{value} and del_flag = 1
and organization_state = 1
@@ -148,9 +148,9 @@
b.tenants_simple_name,
b.user_id
FROM
- `sys_organization` a
- LEFT JOIN `sys_tenants` b ON a.tenants_id = b.tenants_id AND b.del_flag = 1
- LEFT JOIN `tenants_domain_name` c ON b.tenants_id = c.tenants_id AND c.del_flag = 1
+ sys_organization a
+ LEFT JOIN sys_tenants b ON a.tenants_id = b.tenants_id AND b.del_flag = 1
+ LEFT JOIN tenants_domain_name c ON b.tenants_id = c.tenants_id AND c.del_flag = 1
WHERE
a.del_flag = 1
AND (b.tenants_domain_name = #{value}
@@ -216,7 +216,7 @@
SELECT
organization_id
FROM
- `sys_organization`
+ sys_organization
where
del_flag = 1
@@ -225,7 +225,7 @@
SELECT
organization_id
FROM
- `sys_organization`
+ sys_organization
where
del_flag = 1
AND parent_organization_id in
@@ -234,19 +234,29 @@
- select organization_id from (
- select
- t1.organization_id,
- if(find_in_set(parent_organization_id, @pids) > 0, @pids := concat(@pids, ',', organization_id), 0) as ischild
- from (
- select
- organization_id,
- parent_organization_id
- from sys_organization t order by parent_organization_id, organization_id
- ) t1,
- (select @pids := #{id}) t2
- ) t3 where ischild != 0 OR organization_id = #{id}
- order by organization_id
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SELECT organization_id
+ FROM sys_organization
+ WHERE organization_id = #{id}
+ UNION
+ SELECT organization_id
+ FROM sys_organization
+ START WITH organization_id = #{id}
+ CONNECT BY PRIOR organization_id = parent_organization_id
+ ORDER BY organization_id;
@@ -255,6 +265,11 @@
FROM
(
SELECT
+
+
+
+
+
t1.organization_id,
t1.organization_name,
t1.parent_organization_id,
diff --git a/mhd_product/src/main/resources/mapper/organization/OrganizationMenuMapper.xml b/mhd_product/src/main/resources/mapper/organization/OrganizationMenuMapper.xml
index 64c13bcfb..acd384026 100644
--- a/mhd_product/src/main/resources/mapper/organization/OrganizationMenuMapper.xml
+++ b/mhd_product/src/main/resources/mapper/organization/OrganizationMenuMapper.xml
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
del_flag
FROM
- `organization_menu`
+ organization_menu
diff --git a/mhd_product/src/main/resources/mapper/product/ProductDetailsMapper.xml b/mhd_product/src/main/resources/mapper/product/ProductDetailsMapper.xml
index 49559df7e..0fa9f1693 100644
--- a/mhd_product/src/main/resources/mapper/product/ProductDetailsMapper.xml
+++ b/mhd_product/src/main/resources/mapper/product/ProductDetailsMapper.xml
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
spd.update_by,
spd.del_flag
FROM
- `sys_product_details` spd
+ sys_product_details spd
LEFT JOIN sys_modules sm ON spd.modules_id = sm.modules_id
AND sm.del_flag = 1
diff --git a/mhd_product/src/main/resources/mapper/product/ProductMenuMapper.xml b/mhd_product/src/main/resources/mapper/product/ProductMenuMapper.xml
index 828ab0ad9..631e6e0c1 100644
--- a/mhd_product/src/main/resources/mapper/product/ProductMenuMapper.xml
+++ b/mhd_product/src/main/resources/mapper/product/ProductMenuMapper.xml
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
del_flag
FROM
- `product_menu`
+ product_menu
diff --git a/mhd_product/src/main/resources/mapper/product/SysProductMapper.xml b/mhd_product/src/main/resources/mapper/product/SysProductMapper.xml
index ff364a1ea..a5e85dee6 100644
--- a/mhd_product/src/main/resources/mapper/product/SysProductMapper.xml
+++ b/mhd_product/src/main/resources/mapper/product/SysProductMapper.xml
@@ -52,8 +52,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN
(SELECT
p.product_id,
- GROUP_CONCAT(m.modules_name) as modules_names,
- GROUP_CONCAT(m.modules_id) as modules_ids
+ WM_CONCAT(m.modules_name) as modules_names,
+ WM_CONCAT(m.modules_id) as modules_ids
FROM
sys_product p
LEFT JOIN
@@ -68,8 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN (
SELECT
p.product_id AS app_product_id,
- GROUP_CONCAT( m.modules_name ) AS app_modules_names,
- GROUP_CONCAT( m.modules_id ) AS app_modules_ids
+ WM_CONCAT( m.modules_name ) AS app_modules_names,
+ WM_CONCAT( m.modules_id ) AS app_modules_ids
FROM
sys_product p
LEFT JOIN sys_product_details d ON p.product_id = d.product_id
@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
DISTINCT m.menu_id
FROM
- `sys_product` p
+ sys_product p
LEFT JOIN
sys_product_details d
ON p.product_id = d.product_id
@@ -223,7 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
p.product_home_name,
p.route_status
FROM
- `sys_product` p
+ sys_product p
LEFT JOIN tenants_product tp ON tp.product_id = p.product_id
LEFT JOIN sys_organization o ON o.tenants_id = tp.tenants_id
WHERE
@@ -234,7 +234,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
a.product_id
FROM
- `sys_product` a
+ sys_product a
LEFT JOIN sys_product_details b ON a.product_id = b.product_id
AND b.del_flag = 1
LEFT JOIN sys_menu c ON b.modules_id = c.modules_id
diff --git a/mhd_product/src/main/resources/mapper/tenants/SysTenantsMapper.xml b/mhd_product/src/main/resources/mapper/tenants/SysTenantsMapper.xml
index c1fa75307..7f4b49297 100644
--- a/mhd_product/src/main/resources/mapper/tenants/SysTenantsMapper.xml
+++ b/mhd_product/src/main/resources/mapper/tenants/SysTenantsMapper.xml
@@ -60,12 +60,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
sys_tenants t
LEFT JOIN
- `sys_organization` o
+ sys_organization o
ON t.tenants_id = o.tenants_id AND o.parent_organization_id = 0
LEFT JOIN
(SELECT
t.tenants_id,
- GROUP_CONCAT(p.product_name) as product_name
+ WM_CONCAT(p.product_name) as product_name
FROM
sys_tenants t
LEFT JOIN
@@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
p.product_id
FROM
- `sys_tenants` t
+ sys_tenants t
LEFT JOIN
sys_organization o
ON t.tenants_id = o.tenants_id
@@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
o.organization_id = #{values} and t.del_flag = 1 and po.product_status = 1
- SELECT * FROM `sys_tenants`
+ SELECT * FROM sys_tenants
where del_flag = 1
and tenants_domain_name = #{tenantsDomainName}
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.*,
c.organization_id
FROM
- `tenants_domain_name` a
+ tenants_domain_name a
LEFT JOIN sys_tenants b ON a.tenants_id = b.tenants_id
LEFT JOIN sys_organization c ON b.tenants_id = c.tenants_id and c.organization_state =1
WHERE
@@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- UPDATE `sys_tenants` SET `del_flag` = 2 WHERE `tenants_id` = #{tenantsId}
+ UPDATE sys_tenants SET del_flag = 2 WHERE tenants_id = #{tenantsId}
diff --git a/mhd_product/src/main/resources/mapper/tenants/TenantsMenuMapper.xml b/mhd_product/src/main/resources/mapper/tenants/TenantsMenuMapper.xml
index e08184093..7d508b994 100644
--- a/mhd_product/src/main/resources/mapper/tenants/TenantsMenuMapper.xml
+++ b/mhd_product/src/main/resources/mapper/tenants/TenantsMenuMapper.xml
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
del_flag
FROM
- `tenants_menu`
+ tenants_menu
diff --git a/mhd_product/src/main/resources/mapper/tenants/TenantsProductMapper.xml b/mhd_product/src/main/resources/mapper/tenants/TenantsProductMapper.xml
index e968b8b4b..7b506ffb5 100644
--- a/mhd_product/src/main/resources/mapper/tenants/TenantsProductMapper.xml
+++ b/mhd_product/src/main/resources/mapper/tenants/TenantsProductMapper.xml
@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
p.product_icon,
p.product_photo
FROM
- `tenants_product` p
+ tenants_product p
LEFT JOIN
sys_product po
ON po.product_id = p.product_id
diff --git a/mhd_thrid_party/pom.xml b/mhd_thrid_party/pom.xml
index ed64ff6c6..7d5c8bdc4 100644
--- a/mhd_thrid_party/pom.xml
+++ b/mhd_thrid_party/pom.xml
@@ -80,9 +80,14 @@
seata-spring-boot-starter
-
+
+
+ com.dameng
+ DmJdbcDriver18
+ 8.1.1.193
diff --git a/mhd_transport/pom.xml b/mhd_transport/pom.xml
index 3bbe00014..64c31ee4d 100644
--- a/mhd_transport/pom.xml
+++ b/mhd_transport/pom.xml
@@ -74,9 +74,14 @@
mhd-common-redis
-
+
+
+ com.dameng
+ DmJdbcDriver18
+ 8.1.1.193