diff --git a/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysDataPermMapper.xml b/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysDataPermMapper.xml index 9f007f71..b850b449 100644 --- a/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysDataPermMapper.xml +++ b/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysDataPermMapper.xml @@ -9,7 +9,6 @@ - @@ -29,7 +28,6 @@ AND IFNULL(zz_sys_data_perm.data_perm_name, '') LIKE #{safeSearchString} - AND zz_sys_data_perm.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} diff --git a/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysPermCodeMapper.xml b/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysPermCodeMapper.xml index 8a4a0a39..27a90c12 100644 --- a/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysPermCodeMapper.xml +++ b/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysPermCodeMapper.xml @@ -12,7 +12,6 @@ - diff --git a/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysPermModuleMapper.xml b/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysPermModuleMapper.xml index 07401f28..590a713a 100644 --- a/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysPermModuleMapper.xml +++ b/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysPermModuleMapper.xml @@ -11,7 +11,6 @@ - @@ -34,10 +33,7 @@ FROM zz_sys_perm_module pm LEFT JOIN - zz_sys_perm p ON pm.module_id = p.module_id AND p.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} - - AND pm.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} - + zz_sys_perm p ON pm.module_id = p.module_id ORDER BY pm.show_order, p.show_order diff --git a/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysRoleMapper.xml b/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysRoleMapper.xml index fb8fe83e..b0fda15c 100644 --- a/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysRoleMapper.xml +++ b/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysRoleMapper.xml @@ -8,7 +8,6 @@ - @@ -18,7 +17,6 @@ AND role_name LIKE #{safeRoleName} - AND deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} diff --git a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysMenuMapper.xml b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysMenuMapper.xml index 74655ae2..7b4dd3ac 100644 --- a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysMenuMapper.xml +++ b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysMenuMapper.xml @@ -15,7 +15,6 @@ - diff --git a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysPermMapper.xml b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysPermMapper.xml index 1dbaa002..d05586ce 100644 --- a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysPermMapper.xml +++ b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysPermMapper.xml @@ -11,7 +11,6 @@ - diff --git a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysRoleMapper.xml b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysRoleMapper.xml index fb8fe83e..b0fda15c 100644 --- a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysRoleMapper.xml +++ b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysRoleMapper.xml @@ -8,7 +8,6 @@ - @@ -18,7 +17,6 @@ AND role_name LIKE #{safeRoleName} - AND deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL} diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuMapper.xml index e6626e6b..96eba042 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuMapper.xml @@ -15,7 +15,6 @@ - diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermMapper.xml index e5fc3aee..98ba9456 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermMapper.xml @@ -11,7 +11,6 @@ - diff --git a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMapper.xml b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMapper.xml index 950a176d..56f22b48 100644 --- a/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMapper.xml +++ b/orange-demo-single/orange-demo-single-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMapper.xml @@ -8,7 +8,6 @@ - @@ -18,7 +17,6 @@ AND role_name LIKE #{safeRoleName} - AND deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL}