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

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

@@ -143,10 +143,11 @@ 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);
-//
+        wrapper.selectAs(Department::getName, MenuTreeVo::getDeptName)
+                .leftJoin(XjrMenuDeptRelation.class, XjrMenuDeptRelation::getMenuId,Menu::getId)
+                .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);
@@ -155,7 +156,6 @@ public class MenuController {
 //                wrapper.in(XjrMenuDeptRelation::getDeptId, deptIdList);
 //            }
 //        }
-        wrapper.orderByAsc(Menu::getSortCode);
 
         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));

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;
 }