修改菜单管理

user_center/src/main/resources/mapper/MenuMapper.xml

@@ -187,16 +187,16 @@
         a.status as "status"
         from uims_user_role  userrole
         inner join uims_role_menu rolemenu on rolemenu.ROLE_ID=userrole.ROLE_ID and rolemenu.status=1
-        inner join uims_tenant_menu a on a.id= rolemenu.MENU_ID and a.status=1
-        inner join uims_menu b on a.MENU_ID=b.id and b.STATUS=1
+        inner join uims_menu b on rolemenu.MENU_ID=b.id and b.STATUS=1
+        inner join uims_tenant_menu a on a.MENU_ID= b.id and a.status=1
+        <if test="tenantId != null  and tenantId != ''">
+            and a.tenant_id = #{tenantId}
+        </if>
         <where>
             a.status=1  and  userrole.status=1
             <if test="name != null  and name != ''">
                 and a.MENU_NAME LIKE concat('%',#{name},'%')
             </if>
-            <if test="tenantId != null  and tenantId != ''">
-                and a.tenant_id = #{tenantId}
-            </if>
         </where>
         order by a.MENU_SEQ
     </select>
@@ -269,16 +269,17 @@
         b.status as "status"
         from uims_user_role  userrole
         inner join uims_role_menu rolemenu on rolemenu.ROLE_ID=userrole.ROLE_ID and rolemenu.status=1
-        inner join uims_tenant_menu b on b.id= rolemenu.MENU_ID and b.status=1
-        inner join uims_menu a on a.id=b.MENU_ID and a.STATUS=1
+        inner join uims_menu a on a.id=rolemenu.MENU_ID and a.STATUS=1
+        inner join uims_tenant_menu b on a.id= b.MENU_ID and b.status=1
+        <if test="tenantId != null  and tenantId != ''">
+            and b.tenant_id = #{tenantId}
+        </if>
         <where>
             userrole.status=1 and a.PARENT_MENU_ID=0 and a.SHOW_STATE=1
             <if test="userId != null  and userId != ''">
                 and userrole.user_id = #{userId}
             </if>
-            <if test="tenantId != null  and tenantId != ''">
-                and b.tenant_id = #{tenantId}
-            </if>
+
         </where>
         order by b.MENU_SEQ
     </select>
@@ -344,8 +345,11 @@
         b.status as "status"
         from uims_user_role  userrole
         inner join uims_role_menu rolemenu on rolemenu.ROLE_ID=userrole.ROLE_ID and rolemenu.status=1
-        inner join uims_tenant_menu b on b.id= rolemenu.MENU_ID and b.status=1
-        inner join uims_menu a on a.id=b.MENU_ID and a.STATUS=1
+        inner join uims_menu a on a.id=rolemenu.MENU_ID and a.STATUS=1
+        inner join uims_tenant_menu b on a.id= b.MENU_ID and b.status=1
+        <if test="tenantId != null  and tenantId != ''">
+            and b.tenant_id = #{tenantId}
+        </if>
         <where>
             userrole.status=1  and a.SHOW_STATE=1
             <if test="userId != null  and userId != ''">
@@ -354,9 +358,7 @@
             <if test="appId != null  and appId != ''">
                 and a.app_id = #{appId}
             </if>
-            <if test="tenantId != null  and tenantId != ''">
-                and b.tenant_id = #{tenantId}
-            </if>
+
         </where>
         order by b.MENU_SEQ
     </select>