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

2022-02-21 16:43:35 +08:00
parent 41dbca2772 6ba63d508c
commit c705648e3f
21 changed files with 993 additions and 6 deletions
@@ -1030,6 +1030,14 @@
                    #{item}
                </foreach>

+            </if>
+
+            <if test="page.menuId != null and page.menuId =='nomenu' and page.sarMsType != null and page.sarMsType == 'filterSarMsMenu' and page.menuAllChildrenIdList != null">
+                and SAR_STAND_MENU.MENU_ID not in
+                <foreach collection="page.menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+
            </if>
            <!--  新修改需求，根据角色查询有权限的菜单数据-->
            <if test="page.menuRoleList != null">