From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/resources/mappers/SystemDataPermissionMapper.xml | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/server/system_service/src/main/resources/mappers/SystemDataPermissionMapper.xml b/server/system_service/src/main/resources/mappers/SystemDataPermissionMapper.xml
index bcce7d2a..3e84dba 100644
--- a/server/system_service/src/main/resources/mappers/SystemDataPermissionMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemDataPermissionMapper.xml
@@ -64,13 +64,9 @@
<if test="dto.type != null">
AND sdp.`TYPE` = #{dto.type}
</if>
- <if test="role.companyId != null">
- AND role.`COMPANY_ID` = #{role.companyId}
- </if>
<if test="userId != null">
- AND exists (select sr.id from system_user_role sr where sr.role_id=sdp.role_id and sr.user_id=#{userId} and sr.STATUS=0 and sr.deleted=0)
+ AND exists (select sr.id from system_user_role sr where sr.role_id=sdp.role_id and sr.user_id=#{userId} and sr.deleted=0)
</if>
</where>
- order by role.`TYPE` asc
</select>
</mapper>
--
Gitblit v1.9.3