alltree

src/main/java/com/xjrsoft/module/system/controller/MenuController.java

@@ -143,18 +143,18 @@ public class MenuController {
                         .eq(ObjectUtils.isNotEmpty(dto.getEnabledMark()), Menu::getEnabledMark, dto.getEnabledMark())
                         .leftJoin(Subsystem.class, Subsystem::getId, Menu::getSystemId);
 
-//        wrapper.selectAs(Department::getName, MenuTreeVo::getDeptName)
-//                .leftJoin(XjrMenuDeptRelation.class, XjrMenuDeptRelation::getMenuId,Menu::getId)
-//                .leftJoin(Department.class, Department::getId, XjrMenuDeptRelation::getDeptId);
-//
-//        if (StrUtil.isNotEmpty(dto.getDeptIds())) {
-//            String[] deptIdArray = dto.getDeptIds().split(",");
-//            List<String> deptIdList = Arrays.asList(deptIdArray);
-//
-//            if (CollectionUtil.isNotEmpty(deptIdList)) {
-//                wrapper.in(XjrMenuDeptRelation::getDeptId, deptIdList);
-//            }
-//        }
+        wrapper.selectAs(Department::getName, MenuTreeVo::getDeptName)
+                .leftJoin(XjrMenuDeptRelation.class, XjrMenuDeptRelation::getMenuId,Menu::getId)
+                .leftJoin(Department.class, Department::getId, XjrMenuDeptRelation::getDeptId);
+
+        if (StrUtil.isNotEmpty(dto.getDeptIds())) {
+            String[] deptIdArray = dto.getDeptIds().split(",");
+            List<String> deptIdList = Arrays.asList(deptIdArray);
+
+            if (CollectionUtil.isNotEmpty(deptIdList)) {
+                wrapper.in(XjrMenuDeptRelation::getDeptId, deptIdList);
+            }
+        }
         wrapper.orderByAsc(Menu::getSortCode);
 
         List<MenuTreeVo> list = menuService.selectJoinList(MenuTreeVo.class, wrapper);