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

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

@@ -140,12 +140,14 @@ public class MenuController {
                         .select(Menu::getId)
                         .select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuTreeVo.class).contains(x.getProperty()))
                         .selectAs(Subsystem::getName, MenuTreeVo::getSystemName)
-                        .select("t3.name", MenuTreeVo::getDeptName)
-                        .select("t2.dept_id", MenuTreeVo::getDeptId)
+                        .select("GROUP_CONCAT(t3.name  SEPARATOR ',')", MenuTreeVo::getDeptName)
+                        .select("GROUP_CONCAT(t2.dept_id SEPARATOR ',')", MenuTreeVo::getDeptId)
                         .eq(ObjectUtils.isNotEmpty(dto.getEnabledMark()), Menu::getEnabledMark, dto.getEnabledMark())
                         .leftJoin(Subsystem.class, Subsystem::getId, Menu::getSystemId)
                         .leftJoin("xjr_menu_dept_relation t2 ON (t.id = t2.menu_id)")
                         .leftJoin("xjr_department t3 ON (t3.id = t2.dept_id)")
+                        .groupBy(Menu::getId)
+                        .groupBy(Menu::getSortCode)
                         .orderByAsc(Menu::getSortCode);
 
 //        wrapper.select(

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

@@ -6,19 +6,24 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.toolkit.MPJWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.system.dto.AddSystemMenuCommonlyUsedDto;
 import com.xjrsoft.module.system.dto.UpdateSystemMenuCommonlyUsedDto;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 
 import com.xjrsoft.module.system.dto.SystemMenuCommonlyUsedPageDto;
+import com.xjrsoft.module.system.entity.Menu;
 import com.xjrsoft.module.system.entity.SystemMenuCommonlyUsed;
 import com.xjrsoft.module.system.service.ISystemMenuCommonlyUsedService;
+import com.xjrsoft.module.system.vo.MenuTreeVo;
 import com.xjrsoft.module.system.vo.SystemMenuCommonlyUsedPageVo;
 
 import com.xjrsoft.module.system.vo.SystemMenuCommonlyUsedVo;
@@ -30,6 +35,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
 * @title: 常用功能设置
@@ -60,6 +66,34 @@ public class SystemMenuCommonlyUsedController {
         return RT.ok(pageOutput);
     }
 
+    @GetMapping(value = "/nopage")
+    @ApiOperation(value = "常用功能设置列表(不分页)")
+    @SaCheckPermission("systemmenucommonlyused:detail")
+    public List<SystemMenuCommonlyUsedPageVo> noPage(@Valid SystemMenuCommonlyUsedPageDto dto) {
+
+        MPJLambdaWrapper<SystemMenuCommonlyUsed> queryWrapper = MPJWrappers.<SystemMenuCommonlyUsed>lambdaJoin()
+                .orderByDesc(SystemMenuCommonlyUsed::getId)
+                .select(SystemMenuCommonlyUsed.class, x -> VoToColumnUtil.fieldsToColumns(SystemMenuCommonlyUsedPageVo.class).contains(x.getProperty()))
+                .select("t1.icon_url",SystemMenuCommonlyUsedPageVo::getIconUrl)
+                .select("t1.path",SystemMenuCommonlyUsedPageVo::getPath)
+                .select("t1.remark",SystemMenuCommonlyUsedPageVo::getRemark)
+                .select("t1.title",SystemMenuCommonlyUsedPageVo::getTitle)
+                .leftJoin("xjr_menu t1 on t1.id = t.menu_id");
+
+
+        List<SystemMenuCommonlyUsedPageVo> dataList = systemMenuCommonlyUsedService.selectJoinList(SystemMenuCommonlyUsedPageVo.class,queryWrapper);
+        // List<SystemMenuCommonlyUsedPageVo> treeVoList = TreeUtil.build(dataList);
+
+        return dataList;
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除常用功能设置")
+    @SaCheckPermission("systemmenucommonlyused:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(systemMenuCommonlyUsedService.removeBatchByIds(ids));
+    }
+
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询常用功能设置信息")
     @SaCheckPermission("systemmenucommonlyused:detail")
@@ -91,12 +125,6 @@ public class SystemMenuCommonlyUsedController {
 
     }
 
-    @DeleteMapping
-    @ApiOperation(value = "删除常用功能设置")
-    @SaCheckPermission("systemmenucommonlyused:delete")
-    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
-        return RT.ok(systemMenuCommonlyUsedService.removeBatchByIds(ids));
 
-    }
 
 }

src/main/java/com/xjrsoft/module/system/vo/SystemMenuCommonlyUsedPageVo.java

@@ -66,4 +66,16 @@ public class SystemMenuCommonlyUsedPageVo {
     @ApiModelProperty("序号")
     private Integer seq;
 
+    @ApiModelProperty("")
+    private String iconUrl;
+
+    @ApiModelProperty("")
+    private String path;
+
+    @ApiModelProperty("")
+    private String remark;
+
+    @ApiModelProperty("")
+    private String title;
+
 }