From f20e47b2befaee01e4e91c5333c4e98380657e22 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 21 Nov 2025 11:57:39 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E6=9C=80=E6=96=B0=E7=9A=84=E5=88=86=E7=BB=84=E5=92=8C?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1559352555569152]用户编辑页面没有回显最新的分组和角色 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1559352555569152
---
 .../framework/dao/mapper/RoleMapper.xml       | 22 +++++++++----------
 .../framework/dao/mapper/TeamMapper.xml       | 10 ++++-----
 .../framework/dao/mapper/UserMapper.xml       | 14 ++++++------
 .../core/IntegrationHandlerBase.java          |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
index 9d12581cb..f10ded8cd 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
@@ -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`,
@@ -173,7 +173,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         FROM `role`
         WHERE `uuid` = #{value}
     </select>
-
+    <!-- 用户编辑页面用到改语句，不能用户缓存-->
     <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,8 +287,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             #{userUuid}
         </foreach>
     </select>
-
-    <select id="getRoleUuidListByUserUuid" parameterType="java.lang.String" resultType="java.lang.String">
+    <!-- 用户编辑页面用到改语句，不能用户缓存-->
+    <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}
@@ -333,7 +333,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             #{roleUuid}
         </foreach>
     </select>
-
+    <!-- 用户编辑页面用到改语句，不能用户缓存-->
     <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`
@@ -343,7 +343,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         </foreach>
         AND tr.`checked_children` = #{checkedChildren}
     </select>
-
+    <!-- 用户编辑页面用到改语句，不能用户缓存-->
     <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`
@@ -363,8 +363,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             <result property="childrenTeamName" column="childrenTeamName"/>
         </collection>
     </resultMap>
-
-    <select id="getRoleListWithTeamByTeamUuidList" resultMap="roleTeamMap">
+    <!-- 用户编辑页面用到改语句，不能用户缓存-->
+    <select id="getRoleListWithTeamByTeamUuidList" resultMap="roleTeamMap" useCache="false">
         SELECT t.uuid as parentTeamUuid,
         t.`name` as parentTeamName,
         tr.role_uuid as roleUuid,
@@ -377,9 +377,9 @@ 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">
+            parameterType="neatlogic.framework.dto.TeamVo" useCache="false">
         SELECT t.uuid       as parentTeamUuid,
                t.`name`     as parentTeamName,
                tr.role_uuid as roleUuid,
diff --git a/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml
index f6d08139a..cb0ea884d 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml
@@ -320,7 +320,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         FROM `user_team`
         WHERE `team_uuid` = #{value}
     </select>
-
+    <!-- 用户编辑页面用到改语句，不能用户缓存-->
     <select id="getTeamByUuidList" parameterType="java.lang.String" resultType="neatlogic.framework.dto.TeamVo"
             useCache="false">
         SELECT
@@ -387,17 +387,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         </foreach>
         and `is_delete` = 0
     </select>
-
+    <!-- 用户编辑页面用到改语句，不能用户缓存-->
     <select id="getTeamUuidListByUserUuid" parameterType="java.lang.String" resultType="java.lang.String"
-            useCache="true">
+            useCache="false">
         SELECT ut.`team_uuid`
         FROM `user_team` ut
                  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="true">
+            useCache="false">
         SELECT t.uuid, t.name, t.lft, t.rht
         FROM `user_team` ut
                  JOIN team t ON t.`uuid` = ut.`team_uuid` and t.`is_delete` = 0
diff --git a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml
index 55b27edbd..83c00e8a2 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml
@@ -23,8 +23,8 @@ 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">
+    <!-- 用户编辑页面用到改语句，不能用户缓存-->
+    <select id="getUserTokenByUser" parameterType="java.lang.String" resultType="java.lang.String" useCache="false">
         select token
         from `user`
         where uuid = #{value} or user_id = #{value}
@@ -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`,
@@ -452,7 +452,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 +491,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`,
@@ -688,7 +688,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 +696,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
diff --git a/src/main/java/neatlogic/framework/integration/core/IntegrationHandlerBase.java b/src/main/java/neatlogic/framework/integration/core/IntegrationHandlerBase.java
index 2e9f916dd..3d8a0ae43 100644
--- a/src/main/java/neatlogic/framework/integration/core/IntegrationHandlerBase.java
+++ b/src/main/java/neatlogic/framework/integration/core/IntegrationHandlerBase.java
@@ -283,7 +283,7 @@ public abstract class IntegrationHandlerBase implements IIntegrationHandler {
             connection.connect();
         } catch (Exception e) {
             String errorMsg = e.getMessage() == null ? ExceptionUtils.getStackTrace(e) : e.getMessage();
-            logger.error(e.getMessage(), e);
+            logger.error(url + ", " + e.getMessage(), e);
             integrationAuditVo.appendError(errorMsg);
             resultVo.appendError(errorMsg);
             integrationAuditVo.setStatus("failed");
-- 
Gitee


From 267a706b56286b59f63273277fa7136a8a91c3da Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 21 Nov 2025 12:00:36 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E6=9C=80=E6=96=B0=E7=9A=84=E5=88=86=E7=BB=84=E5=92=8C?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1559352555569152]用户编辑页面没有回显最新的分组和角色 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1559352555569152
---
 .../framework/dao/mapper/RoleMapper.xml          | 16 ++++++++--------
 .../framework/dao/mapper/TeamMapper.xml          |  6 +++---
 .../framework/dao/mapper/UserMapper.xml          | 12 ++++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
index f10ded8cd..b190d99c5 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
@@ -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`,
@@ -173,7 +173,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         FROM `role`
         WHERE `uuid` = #{value}
     </select>
-    <!-- 用户编辑页面用到改语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能用户缓存-->
     <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,7 +287,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             #{userUuid}
         </foreach>
     </select>
-    <!-- 用户编辑页面用到改语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能用户缓存-->
     <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`
@@ -333,7 +333,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             #{roleUuid}
         </foreach>
     </select>
-    <!-- 用户编辑页面用到改语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能用户缓存-->
     <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`
@@ -343,7 +343,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         </foreach>
         AND tr.`checked_children` = #{checkedChildren}
     </select>
-    <!-- 用户编辑页面用到改语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能用户缓存-->
     <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`
@@ -363,7 +363,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,
@@ -377,7 +377,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 cb0ea884d..6a17ec435 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml
@@ -320,7 +320,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         FROM `user_team`
         WHERE `team_uuid` = #{value}
     </select>
-    <!-- 用户编辑页面用到改语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能用户缓存-->
     <select id="getTeamByUuidList" parameterType="java.lang.String" resultType="neatlogic.framework.dto.TeamVo"
             useCache="false">
         SELECT
@@ -387,7 +387,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         </foreach>
         and `is_delete` = 0
     </select>
-    <!-- 用户编辑页面用到改语句，不能用户缓存-->
+    <!-- 用户编辑页面用到该语句，不能用户缓存-->
     <select id="getTeamUuidListByUserUuid" parameterType="java.lang.String" resultType="java.lang.String"
             useCache="false">
         SELECT ut.`team_uuid`
@@ -395,7 +395,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 83c00e8a2..326f1e784 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`,
@@ -452,7 +452,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 +491,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`,
@@ -688,7 +688,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 +696,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
-- 
Gitee


From 984dc84c941b0a629cfdd7120bb699956c2d0fc0 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 21 Nov 2025 12:10:16 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E6=9C=80=E6=96=B0=E7=9A=84=E5=88=86=E7=BB=84=E5=92=8C?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1559352555569152]用户编辑页面没有回显最新的分组和角色 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1559352555569152
---
 .../java/neatlogic/framework/dao/mapper/RoleMapper.xml     | 7 ++++---
 .../java/neatlogic/framework/dao/mapper/TeamMapper.xml     | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
index b190d99c5..0fcf23e6d 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
@@ -173,7 +173,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         FROM `role`
         WHERE `uuid` = #{value}
     </select>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- AuthenticationInfo用到该语句，不能用户缓存-->
     <select id="getRoleByUuidList" parameterType="java.lang.String" resultType="neatlogic.framework.dto.RoleVo"
             useCache="false">
         SELECT
@@ -288,6 +288,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         </foreach>
     </select>
     <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- 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`
@@ -333,7 +334,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             #{roleUuid}
         </foreach>
     </select>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- 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`
@@ -343,7 +344,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         </foreach>
         AND tr.`checked_children` = #{checkedChildren}
     </select>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- 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`
diff --git a/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml
index 6a17ec435..4ef168e9a 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/TeamMapper.xml
@@ -320,7 +320,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         FROM `user_team`
         WHERE `team_uuid` = #{value}
     </select>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- AuthenticationInfo用到该语句，不能用户缓存-->
     <select id="getTeamByUuidList" parameterType="java.lang.String" resultType="neatlogic.framework.dto.TeamVo"
             useCache="false">
         SELECT
@@ -387,7 +387,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         </foreach>
         and `is_delete` = 0
     </select>
-    <!-- 用户编辑页面用到该语句，不能用户缓存-->
+    <!-- AuthenticationInfo用到该语句，不能用户缓存-->
     <select id="getTeamUuidListByUserUuid" parameterType="java.lang.String" resultType="java.lang.String"
             useCache="false">
         SELECT ut.`team_uuid`
-- 
Gitee


From 4bbff288f39277d5f13cd3f96729f0d90a8492e0 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 21 Nov 2025 12:30:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E6=9C=80=E6=96=B0=E7=9A=84=E5=88=86=E7=BB=84=E5=92=8C?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1559352555569152]用户编辑页面没有回显最新的分组和角色 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1559352555569152
---
 .../framework/dao/mapper/RoleMapper.xml       | 30 +++++++++----------
 .../framework/dao/mapper/TeamMapper.xml       | 11 +++----
 .../framework/dao/mapper/UserMapper.xml       | 24 ++++++++-------
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
index 0fcf23e6d..7af9ec186 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 4ef168e9a..f12d96be6 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 326f1e784..fd6b073f3 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`,
-- 
Gitee