Browse Source

fix commonlyPage

brealinxx 1 năm trước cách đây
mục cha
commit
5182ad954d

+ 3 - 2
src/main/java/com/xjrsoft/module/system/controller/SystemMenuCommonlyUsedController.java

@@ -69,11 +69,12 @@ public class SystemMenuCommonlyUsedController {
     @GetMapping(value = "/nopage")
     @ApiOperation(value = "常用功能设置列表(不分页)")
     @SaCheckPermission("systemmenucommonlyused:detail")
-    public List<SystemMenuCommonlyUsedPageVo> noPage(@Valid SystemMenuCommonlyUsedPageDto dto) {
+    public RT<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("t.id",SystemMenuCommonlyUsedPageVo::getId)
                 .select("t1.icon_url",SystemMenuCommonlyUsedPageVo::getIconUrl)
                 .select("t1.path",SystemMenuCommonlyUsedPageVo::getPath)
                 .select("t1.remark",SystemMenuCommonlyUsedPageVo::getRemark)
@@ -84,7 +85,7 @@ public class SystemMenuCommonlyUsedController {
         List<SystemMenuCommonlyUsedPageVo> dataList = systemMenuCommonlyUsedService.selectJoinList(SystemMenuCommonlyUsedPageVo.class,queryWrapper);
         // List<SystemMenuCommonlyUsedPageVo> treeVoList = TreeUtil.build(dataList);
 
-        return dataList;
+        return RT.ok(dataList);
     }
 
     @DeleteMapping