Browse Source

查询租户菜单接口修改:直接查询所有租户菜单

wangli 4 years ago
parent
commit
620c3a88ea

+ 3 - 3
user_center/src/main/java/com/huaxu/controller/UserController.java

@@ -120,10 +120,10 @@ public class UserController {
     /**
      * 按应用查询菜单信息(所有租户菜单:isTenant=1)
      */
-    @ApiOperation(value = "查询应用菜单信息")
+    @ApiOperation(value = "查询所有菜单信息")
     @RequestMapping(value = "/findTenantMenu", method = RequestMethod.GET)
-    public AjaxMessage<List<MenuEntity>> findTenantMenu(@ApiParam(value = "应用ID", required = true) @RequestParam String appId) {
-        List<MenuEntity> menuEntityList = menuService.findTenantMenu(appId);
+    public AjaxMessage<List<MenuEntity>> findTenantMenu() {
+        List<MenuEntity> menuEntityList = menuService.findTenantMenu();
         return new AjaxMessage<>(ResultStatus.OK, menuEntityList);
     }
 

+ 1 - 1
user_center/src/main/java/com/huaxu/dao/MenuMapper.java

@@ -56,5 +56,5 @@ public interface MenuMapper extends BaseMapper<MenuEntity> {
     MenuEntity findUserMenuById(@Param("tenantId") String tenantId,@Param("id")  Long id);
     /**删除相关方法  使用mybatis-plus集成的 **/
 
-    List<MenuEntity> findSystemTenantMenu(@Param("appId") String appId);
+    List<MenuEntity> findSystemTenantMenu();
 }

+ 2 - 2
user_center/src/main/java/com/huaxu/service/MenuService.java

@@ -291,8 +291,8 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 		List<MenuEntity> menuTree = getMenuTree(menuEntities, Long.valueOf(0), 1);
 		return menuTree;
 	}
-	public List<MenuEntity> findTenantMenu(String appId) {
-		List<MenuEntity> menuTree = getMenuTree(menuMapper.findSystemTenantMenu(appId), Long.valueOf(0), 1);
+	public List<MenuEntity> findTenantMenu() {
+		List<MenuEntity> menuTree = getMenuTree(menuMapper.findSystemTenantMenu(), Long.valueOf(0), 1);
 		return menuTree;
 	}
 }

+ 0 - 3
user_center/src/main/resources/mapper/MenuMapper.xml

@@ -370,9 +370,6 @@
         FROM uims_menu a
         <where>
             a.status=1 and  a.SHOW_STATE=1 and is_tenant =1
-            <if test="appId != null  and appId != ''">
-                and a.app_id = #{appId}
-            </if>
         </where>
         order by a.seq
     </select>