diff --git a/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/RoleMapper.xml
index 9d12581cb5a633da3da36a15b1622ddfadb23068..0fcf23e6d2d57084ac0bafc8270e5c128e34a01d 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 .-->
FROM `role_authority`
WHERE `role_uuid` = #{roleUuid}
-
+
SELECT `role_uuid` as `roleUuid`,
@@ -173,7 +173,7 @@ along with this program. If not, see .-->
FROM `role`
WHERE `uuid` = #{value}
-
+
SELECT
@@ -232,7 +232,7 @@ along with this program. If not, see .-->
#{item}
-
+
SELECT `auth` as `name`,
COUNT(DISTINCT (`role_uuid`)) as `roleCount`
@@ -287,8 +287,9 @@ along with this program. If not, see .-->
#{userUuid}
-
-
+
+
+
select ur.`role_uuid`
from `user_role` ur join `role` r on ur.`role_uuid` = r.`uuid`
where ur.`user_uuid` = #{value}
@@ -333,7 +334,7 @@ along with this program. If not, see .-->
#{roleUuid}
-
+
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 .-->
AND tr.`checked_children` = #{checkedChildren}
-
+
select tr.`role_uuid`
FROM `team_role` tr join `role` r on tr.`role_uuid` = r.`uuid`
@@ -363,8 +364,8 @@ along with this program. If not, see .-->
-
-
+
+
SELECT t.uuid as parentTeamUuid,
t.`name` as parentTeamName,
tr.role_uuid as roleUuid,
@@ -377,9 +378,9 @@ along with this program. If not, see .-->
#{uuid}
-
+
+ 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 f6d08139aa051fe2fdf72d3453de8fd581117585..4ef168e9a90e987ea29245ff2151a0ea4bf338fc 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 .-->
FROM `user_team`
WHERE `team_uuid` = #{value}
-
+
SELECT
@@ -387,17 +387,17 @@ along with this program. If not, see .-->
and `is_delete` = 0
-
+
+ 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};
-
+
+ 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 55b27edbd9ab75b2171d68e4e5eaa077110a58a0..326f1e784f31c084532ca04a2d029ce78f6c52ad 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 .-->
from `user`
where user_id = #{value}
-
-
+
+
select token
from `user`
where uuid = #{value} or user_id = #{value}
@@ -166,7 +166,7 @@ along with this program. If not, see .-->
-
+
SELECT a.`id`,
a.`uuid`,
@@ -452,7 +452,7 @@ along with this program. If not, see .-->
WHERE b.`auth` = #{auth}
ORDER BY b.`id`
-
+
SELECT `user_uuid` as `userUid`,
@@ -491,7 +491,7 @@ along with this program. If not, see .-->
-
+
SELECT a.`role_uuid` as `roleUuid`,
@@ -688,7 +688,7 @@ along with this program. If not, see .-->
ORDER BY `id` DESC
-
+
SELECT a.`auth` as `name`,
COUNT(DISTINCT (a.`user_uuid`)) as `userCount`
@@ -696,7 +696,7 @@ along with this program. If not, see .-->
LEFT JOIN `user` b ON a.`user_uuid` = b.`uuid`
GROUP BY a.`auth`
-
+
SELECT
diff --git a/src/main/java/neatlogic/framework/integration/core/IntegrationHandlerBase.java b/src/main/java/neatlogic/framework/integration/core/IntegrationHandlerBase.java
index 2e9f916dd7a05f5f567dd33131229ffc95e81db8..3d8a0ae437f41c9d842041a89e699ad6605801c9 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");