diff --git a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml index 7b4ab29dce05d5c486aaa73631dd94c961480265..9d12581cb5a633da3da36a15b1622ddfadb23068 100644 --- a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml +++ b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml @@ -181,7 +181,8 @@ along with this program. If not, see .--> `uuid`, `name`, `description`, - `rule` + `rule`, + `is_delete` AS isDelete FROM `role` WHERE `is_delete` = 0 AND `uuid` IN @@ -196,9 +197,10 @@ along with this program. If not, see .--> `uuid`, `name`, `description`, - `rule` + `rule`, + `is_delete` AS isDelete FROM `role` - WHERE `is_delete` = 0 AND `uuid` IN + WHERE `uuid` IN #{item} diff --git a/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml index 6c8b8f8e0b0d3b4f54171b6b312e797ca8ffee46..4ce7d717bc45568369cf5715bc99648dd2e00c20 100644 --- a/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml +++ b/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml @@ -166,7 +166,8 @@ along with this program. If not, see .--> a.`parent_uuid` as `parentUuid`, a.`level`, a.`upward_uuid_path` AS upwardUuidPath, - a.`upward_name_path` AS upwardNamePath + a.`upward_name_path` AS upwardNamePath, + a.`is_delete` AS isDelete FROM `team` a @@ -188,6 +189,14 @@ along with this program. If not, see .--> a.`id`, a.`uuid`, a.`name`, + a.`email`, + a.`phone`, + a.`parent_uuid` AS parentUuid, + a.`level`, + a.`lft`, + a.`rht`, + a.`upward_uuid_path` AS upwardUuidPath, + a.`upward_name_path` AS upwardNamePath, a.`is_delete` AS isDelete FROM `team` a @@ -325,7 +334,8 @@ along with this program. If not, see .--> `lft`, `rht`, `upward_uuid_path` AS upwardUuidPath, - `upward_name_path` AS upwardNamePath + `upward_name_path` AS upwardNamePath, + `is_delete` AS isDelete FROM `team` WHERE `uuid` in @@ -347,7 +357,8 @@ along with this program. If not, see .--> `rht`, `is_delete` AS isDelete, `upward_uuid_path` AS upwardUuidPath, - `upward_name_path` AS upwardNamePath + `upward_name_path` AS upwardNamePath, + `is_delete` AS isDelete FROM `team` WHERE `uuid` in diff --git a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml index 47745c31b079a18276150f66f127cae24f9cd7d3..9725d11cb8e62e5fc848f14de391ee456358393f 100644 --- a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml +++ b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml @@ -640,7 +640,10 @@ along with this program. If not, see .--> `phone`, `is_active` AS isActive, `user_info` AS userInfo, - `vip_level` AS vipLevel + `vip_level` AS vipLevel, + `pinyin`, + `is_delete` AS isDelete, + `is_super_admin` AS isSuperAdmin FROM `user` Where `uuid` in diff --git a/src/main/java/neatlogic/framework/form/dao/mapper/FormMapper.xml b/src/main/java/neatlogic/framework/form/dao/mapper/FormMapper.xml index 8beea1a55a687d6a1ca4984a245bbd20009f1877..ea727bd060e5112f4aa396168c1d819d2f56f725 100644 --- a/src/main/java/neatlogic/framework/form/dao/mapper/FormMapper.xml +++ b/src/main/java/neatlogic/framework/form/dao/mapper/FormMapper.xml @@ -300,6 +300,7 @@ along with this program. If not, see .--> FROM `form_attribute` a JOIN `form_version` b ON b.`uuid` = a.`formversion_uuid` AND b.`is_active` = 1 WHERE a.`uuid` = #{value} + LIMIT 1