Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/xservices/xs/sql/XS0702.xml

@@ -22,24 +22,21 @@
                 node_ename not in <iterate close=")" open="(" conjunction="," property="notNodeEnames">#notNodeEnames[]#</iterate>
             </isNotEmpty>
             <!-- 非管理员非root节点仅显示有权限的菜单 added by songx at 20240126 -->
-            <isNotEqual property="node" compareValue="root">
-                <isEqual prepend=" AND " property="isUserAdmin" compareValue="0">
-                    (exists (
-                        select
-                            c. object_id, d.resource_ename
-                        from ${platSchema}.xs_user a,
-                            ${platSchema}.xs_user_group_member b,
-                            ${platSchema}.xs_authorization c,
-                            ${platSchema}.xs_resource d
-                        where a.user_id = b.member_id
-                        and b.parent_id = c.subject_id
-                        and c.object_id = d.id
-                        and a.login_name = #loginName#
-                        and d.type = 'PAGE'
-                        and m.node_ename = d.resource_ename
-                    ) or node_type = '2')
-                </isEqual>
-            </isNotEqual>
+            <isEqual prepend=" AND " property="isUserAdmin" compareValue="0">
+                exists (
+                    select c.object_id, d.resource_ename
+                    from ${platSchema}.xs_user a,
+                    ${platSchema}.xs_user_group_member b,
+                    ${platSchema}.xs_authorization c,
+                    ${platSchema}.xs_resource d
+                    where a.user_id = b.member_id
+                    and b.parent_id = c.subject_id
+                    and c.object_id = d.id
+                    and a.login_name = #loginName#
+                    and d.type = 'PAGE'
+                    and find_in_set(d.resource_ename, (select queryMenuPageInfo(m.node_ename)))
+                )
+            </isEqual>
         </dynamic>
         UNION
         SELECT