Merge remote-tracking branch 'origin/master'

2024-08-06 17:52:39 +08:00
parent e471772dbc eda1cfb6d8
commit 837ded8282
1 changed files with 12 additions and 8 deletions
--- a/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.xml
+++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.xml
@@ -165,13 +165,17 @@
    </select>

    <select id="selAllByOrgSidPath" resultType="com.yxt.portal.biz.sysstafforg.SysStaffOrgByUserVo">
-        SELECT su.sid,
+        SELECT
+                su.sid,
                ss.`name`
-        FROM sys_staff_org so
+        FROM
+                sys_staff_org so
                        LEFT JOIN sys_user su
                        ON so.`staffSid` = su.`staffSid`
                        LEFT JOIN sys_staffinfo ss
                        ON so.`staffSid` = ss.`sid`
-        WHERE su.`orgSid` = #{orgSidPath}
+                        LEFT JOIN sys_user_role sur
+                        ON su.`sid` = sur.`userSid`
+        WHERE sur.`orgSid` = #{orgSidPath}
    </select>
 </mapper>