brealinxx 1 year ago
parent
commit
59265752dc

+ 12 - 11
src/main/java/com/xjrsoft/module/system/controller/MenuController.java

@@ -145,17 +145,17 @@ public class MenuController {
 
         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);
+                .leftJoin(Department.class, Department::getId, XjrMenuDeptRelation::getDeptId)
+                .orderByAsc(Menu::getSortCode);
+
+//        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);
+//            }
+//        }
 
         List<MenuTreeVo> list = menuService.selectJoinList(MenuTreeVo.class, wrapper);
         List<MenuTreeVo> treeVoList = TreeUtil.build(list);
@@ -253,6 +253,7 @@ public class MenuController {
         menuFormService.remove(Wrappers.<MenuForm>query().lambda().eq(MenuForm::getMenuId, menu.getId()));
         menuFormService.saveBatch(formList);
 
+        //多选
         List<XjrMenuDeptRelation> menuDeptRelationsList = new ArrayList<>();
         for (AddXjrMenuDeptRelationDto addXjrMenuDeptRelationDto : dto.getMenuDeptRelations()) {
             menuDeptRelationsList.add(BeanUtil.toBean(addXjrMenuDeptRelationDto, XjrMenuDeptRelation.class));

+ 0 - 3
src/main/java/com/xjrsoft/module/system/dto/MenuTreeDto.java

@@ -33,7 +33,4 @@ public class MenuTreeDto {
 
     // 菜单是否显示 0=隐藏 1=显示
     private Integer display = 1;
-
-    @ApiModelProperty("部门ID")
-    private String deptIds;
 }