diff --git a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
index 0fcf23e6d2d57084ac0bafc8270e5c128e34a01d..7af9ec186684770d4d6393e7a34a91070504ac70 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         WHERE auth IN
         <foreach collection="authList" item="item" open="(" separator="," close=")">#{item}</foreach>
     </select>
-
+    <!-- 角色编辑页面用到该语句，不能使用缓存-->
     <select id="checkRoleIsExists" parameterType="java.lang.String" resultType="int" useCache="false">
         SELECT COUNT(1)
         FROM `role`
@@ -94,7 +94,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             LIMIT #{startNum}, #{pageSize}
         </if>
     </select>
-
+    <!-- 角色编辑页面用到该语句，不能使用缓存-->
     <select id="searchRoleAuthByRoleUuid" parameterType="String" resultType="neatlogic.framework.dto.RoleAuthVo"
             useCache="false">
         SELECT `role_uuid`  as `roleUuid`,
@@ -103,7 +103,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         FROM `role_authority`
         WHERE `role_uuid` = #{roleUuid}
     </select>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能使用缓存-->
     <select id="searchRoleAuthByRoleUuidList" parameterType="String" resultType="neatlogic.framework.dto.RoleAuthVo"
             useCache="false">
         SELECT `role_uuid`  as `roleUuid`,
@@ -138,9 +138,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         FROM `user_role`
         WHERE `role_uuid` = #{value}
     </select>
-
+    <!-- 角色编辑页面用到该语句，不能使用缓存-->
     <select id="getRoleByUuid" parameterType="java.lang.String" resultType="neatlogic.framework.dto.RoleVo"
-            useCache="true">
+            useCache="false">
         SELECT `id`,
                `uuid`,
                `name`,
@@ -173,7 +173,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         FROM `role`
         WHERE `uuid` = #{value}
     </select>
-    <!-- AuthenticationInfo用到该语句，不能用户缓存-->
+    <!-- AuthenticationInfo用到该语句，不能使用缓存-->
     <select id="getRoleByUuidList" parameterType="java.lang.String" resultType="neatlogic.framework.dto.RoleVo"
             useCache="false">
         SELECT
@@ -232,7 +232,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             #{item}
         </foreach>
     </select>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能使用缓存-->
     <select id="getRoleCountByAuth" resultType="neatlogic.framework.dto.AuthVo" useCache="false">
         SELECT `auth`                        as `name`,
                COUNT(DISTINCT (`role_uuid`)) as `roleCount`
@@ -287,15 +287,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             #{userUuid}
         </foreach>
     </select>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
-    <!-- AuthenticationInfo用到该语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能使用缓存-->
+    <!-- AuthenticationInfo用到该语句，不能使用缓存-->
     <select id="getRoleUuidListByUserUuid" parameterType="java.lang.String" resultType="java.lang.String" useCache="false">
         select ur.`role_uuid`
         from `user_role` ur join `role` r on ur.`role_uuid` = r.`uuid`
         where ur.`user_uuid` = #{value}
     </select>
-
-    <select id="getRoleTeamListByRoleUuid" resultType="neatlogic.framework.dto.RoleTeamVo">
+    <!-- 角色编辑页面用到该语句，不能使用缓存-->
+    <select id="getRoleTeamListByRoleUuid" resultType="neatlogic.framework.dto.RoleTeamVo" useCache="false">
         SELECT `team_uuid`        AS teamUuid,
                `checked_children` AS checkedChildren
         FROM `team_role`
@@ -334,7 +334,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             #{roleUuid}
         </foreach>
     </select>
-    <!-- AuthenticationInfo用到该语句，不能用户缓存-->
+    <!-- AuthenticationInfo用到该语句，不能使用缓存-->
     <select id="getRoleUuidListByTeamUuidListAndCheckedChildren" resultType="java.lang.String" useCache="false">
         select tr.`role_uuid`
         FROM `team_role` tr  join `role` r on tr.`role_uuid` = r.`uuid`
@@ -344,7 +344,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         </foreach>
         AND tr.`checked_children` = #{checkedChildren}
     </select>
-    <!-- AuthenticationInfo用到该语句，不能用户缓存-->
+    <!-- AuthenticationInfo用到该语句，不能使用缓存-->
     <select id="getRoleUuidListByTeamUuidList" resultType="java.lang.String" useCache="false">
         select tr.`role_uuid`
         FROM `team_role` tr  join `role` r on tr.`role_uuid` = r.`uuid`
@@ -364,7 +364,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             <result property="childrenTeamName" column="childrenTeamName"/>
         </collection>
     </resultMap>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能使用缓存-->
     <select id="getRoleListWithTeamByTeamUuidList" resultMap="roleTeamMap" useCache="false">
         SELECT t.uuid as parentTeamUuid,
         t.`name` as parentTeamName,
@@ -378,7 +378,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             #{uuid}
         </foreach>
     </select>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能使用缓存-->
     <select id="getParentTeamRoleListWithCheckedChildrenByTeam" resultMap="roleTeamMap"
             parameterType="neatlogic.framework.dto.TeamVo" useCache="false">
         SELECT t.uuid       as parentTeamUuid,
diff --git a/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml
index 4ef168e9a90e987ea29245ff2151a0ea4bf338fc..f12d96be6bc52a063c278fc3990a2817f5c7d5d4 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml
@@ -153,7 +153,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             </if>
         </where>
     </select>
-
+    <!-- 分组编辑页面用到该语句，不能使用缓存-->
     <select id="getTeam" parameterType="neatlogic.framework.dto.TeamVo" resultMap="teamMap" useCache="false">
         SELECT
         a.`id`,
@@ -225,7 +225,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         WHERE a.`uuid` = #{uuid}
           and a.`is_delete` = 0
     </select>
-
+    <!-- 分组编辑页面用到该语句，不能使用缓存-->
     <select id="checkTeamIsExists" parameterType="string" resultType="int" useCache="false">
         SELECT COUNT(1)
         FROM `team`
@@ -320,7 +320,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         FROM `user_team`
         WHERE `team_uuid` = #{value}
     </select>
-    <!-- AuthenticationInfo用到该语句，不能用户缓存-->
+    <!-- AuthenticationInfo用到该语句，不能使用缓存-->
+    <!-- 角色编辑页面用到该语句，不能使用缓存-->
     <select id="getTeamByUuidList" parameterType="java.lang.String" resultType="neatlogic.framework.dto.TeamVo"
             useCache="false">
         SELECT
@@ -387,7 +388,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         </foreach>
         and `is_delete` = 0
     </select>
-    <!-- AuthenticationInfo用到该语句，不能用户缓存-->
+    <!-- AuthenticationInfo用到该语句，不能使用缓存-->
     <select id="getTeamUuidListByUserUuid" parameterType="java.lang.String" resultType="java.lang.String"
             useCache="false">
         SELECT ut.`team_uuid`
@@ -395,7 +396,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                  JOIN team t ON t.`uuid` = ut.`team_uuid` and t.`is_delete` = 0
         WHERE ut.`user_uuid` = #{userUuid};
     </select>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能使用缓存-->
     <select id="getTeamListByUserUuid" parameterType="java.lang.String" resultType="neatlogic.framework.dto.TeamVo"
             useCache="false">
         SELECT t.uuid, t.name, t.lft, t.rht
diff --git a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml
index 326f1e784f31c084532ca04a2d029ce78f6c52ad..fd6b073f3c72b8c4edf3fb783ba40ac6d8556294 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         from `user`
         where user_id = #{value}
     </select>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能使用缓存-->
     <select id="getUserTokenByUser" parameterType="java.lang.String" resultType="java.lang.String" useCache="false">
         select token
         from `user`
@@ -166,7 +166,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             <result property="upwardNamePath" column="upwardNamePath"/>
         </collection>
     </resultMap>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能使用缓存-->
     <select id="getUserByUuid" parameterType="java.lang.String" resultType="neatlogic.framework.dto.UserVo" useCache="false">
         SELECT a.`id`,
         a.`uuid`,
@@ -255,7 +255,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         FROM `user` a
         WHERE a.`vip_level` != 0
     </select>
-
+    <!-- 分组编辑页面用到该语句，不能使用缓存-->
     <select id="searchUserUuidList" parameterType="neatlogic.framework.dto.UserVo" resultType="java.lang.String" useCache="false">
         SELECT
             a.`uuid`
@@ -300,6 +300,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         </if>
         LIMIT #{startNum}, #{pageSize}
     </select>
+    <!-- 分组编辑页面用到该语句，不能使用缓存-->
     <select id="searchUserDetailInfoByUuidList" parameterType="neatlogic.framework.dto.UserVo" resultMap="userInfoMap" useCache="false">
         SELECT
         a.`id`,
@@ -452,7 +453,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         WHERE b.`auth` = #{auth}
         ORDER BY b.`id`
     </select>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能使用缓存-->
     <select id="searchUserAuthByUserUuid" parameterType="String" resultType="neatlogic.framework.dto.UserAuthVo"
             useCache="false">
         SELECT `user_uuid`  as `userUid`,
@@ -491,7 +492,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             </foreach>
         </if>
     </select>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能使用缓存-->
     <select id="searchUserRoleAuthByUserUuid" parameterType="String" resultType="neatlogic.framework.dto.RoleAuthVo"
             useCache="false">
         SELECT a.`role_uuid`  as `roleUuid`,
@@ -501,7 +502,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                  LEFT JOIN `user_role` b ON a.`role_uuid` = b.`role_uuid`
         WHERE b.`user_uuid` = #{userUuid}
     </select>
-
+    <!-- 分组编辑页面用到该语句，不能使用缓存-->
+    <!-- 角色编辑页面用到该语句，不能使用缓存-->
     <select id="searchUserCount" parameterType="neatlogic.framework.dto.UserVo" resultType="int" useCache="false">
         SELECT
             count(DISTINCT (a.`uuid`))
@@ -645,7 +647,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
           AND a.`is_active` = 1
           AND a.`is_delete` = 0
     </select>
-
+    <!-- 分组编辑页面用到该语句，不能使用缓存-->
     <select id="getUserByUserUuidList" parameterType="java.lang.String" resultType="neatlogic.framework.dto.UserVo"
             useCache="false">
         SELECT
@@ -688,7 +690,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         </foreach>
         ORDER BY `id` DESC
     </select>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能使用缓存-->
     <select id="getUserCountByAuth" resultType="neatlogic.framework.dto.AuthVo" useCache="false">
         SELECT a.`auth`                        as `name`,
                COUNT(DISTINCT (a.`user_uuid`)) as `userCount`
@@ -696,7 +698,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                  LEFT JOIN `user` b ON a.`user_uuid` = b.`uuid`
         GROUP BY a.`auth`
     </select>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能使用缓存-->
     <select id="getUserProfileByUserUuidAndModuleId" parameterType="java.lang.String"
             resultType="neatlogic.framework.dto.UserProfileVo" useCache="false">
         SELECT
@@ -885,7 +887,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             #{item}
         </foreach>
     </select>
-
+    <!-- 分组编辑页面用到该语句，不能使用缓存-->
     <select id="getUserListByTeamUuid" parameterType="java.lang.String" resultType="neatlogic.framework.dto.UserVo"
             useCache="false">
         SELECT a.`team_uuid` AS teamUuid,
@@ -995,7 +997,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             #{item}
         </foreach>
     </select>
-
+    <!-- 角色编辑页面用到该语句，不能使用缓存-->
     <select id="getUserListByRoleUuid" parameterType="neatlogic.framework.dto.UserVo" resultMap="userInfoMap"
             useCache="false">
         SELECT k.`id`,