Procházet zdrojové kódy

修改收藏和目录排序不起作用的BUG

wukai před 1 rokem
rodič
revize
c9f7e0e8c5

+ 5 - 3
doc-biz/src/main/java/com/doc/biz/controller/DocDirController.java

@@ -8,6 +8,7 @@ import com.doc.common.annotation.Log;
 import com.doc.common.constant.Constants;
 import com.doc.common.core.controller.BaseController;
 import com.doc.common.core.domain.AjaxResult;
+import com.doc.common.core.page.TableDataInfo;
 import com.doc.common.enums.BusinessType;
 import com.doc.common.enums.EventLevel;
 import com.doc.common.utils.DateUtils;
@@ -178,7 +179,8 @@ public class DocDirController extends BaseController {
     @ApiOperation("查询目录列表")
     //@PreAuthorize("@ss.hasPermi('biz:dir:list')")
     @GetMapping("/list")
-    public AjaxResult list(DocDir docDir) {
+    public TableDataInfo list(DocDir docDir) {
+        startPage();
         List<DocDir> list = docDirService.selectDocDirList(docDir);
         DocDir dir = docDirService.selectDocDirByDirId(docDir.getParentId());
         if (dir.getParentId() != 0) {
@@ -191,7 +193,7 @@ public class DocDirController extends BaseController {
             recentService.insertDocRecent(recent);
         }
 
-        return success(list);
+        return getDataTable(list);
     }
 
     /**
@@ -199,7 +201,7 @@ public class DocDirController extends BaseController {
      */
     @ApiOperation("按空间类型查询目录列表")
     @GetMapping("/list/{type}")
-    public AjaxResult listByType(@ApiParam(value = "目录类型(1.公共 2.部门 3.个人)", required = true) @PathVariable("type") String type, DocDir docDir) {
+    public TableDataInfo listByType(@ApiParam(value = "目录类型(1.公共 2.部门 3.个人)", required = true) @PathVariable("type") String type, DocDir docDir) {
         docDirService.addRole(docDir, type);
         return list(docDir);
     }

+ 3 - 2
doc-biz/src/main/java/com/doc/biz/controller/DocFavoriteController.java

@@ -55,10 +55,11 @@ public class DocFavoriteController extends BaseController {
     @ApiOperation("根据标签ID查询列表")
     //@PreAuthorize("@ss.hasPermi('biz:favorite:list')")
     @GetMapping("/list/{labelId}")
-    public List<DocFavorite> listByLabelId(@ApiParam(value = "标签ID", required = true) @PathVariable Long labelId) {
+    public TableDataInfo listByLabelId(@ApiParam(value = "标签ID", required = true) @PathVariable Long labelId) {
         DocFavorite docFavorite = new DocFavorite();
         docFavorite.setLabelId(labelId);
         docFavorite.setOwner(SecurityUtils.getUserId());
+        startPage();
         List<DocFavorite> list = docFavoriteService.selectDocFavoriteList(docFavorite);
         for (DocFavorite favorite : list) {
             if ("Y".equals(favorite.getIsFolder())) {
@@ -67,7 +68,7 @@ public class DocFavoriteController extends BaseController {
                 favorite.setDocInfo(docInfoService.selectDocInfoByDocId(favorite.getRelaId()));
             }
         }
-        return list;
+        return getDataTable(list);
     }
 
     /**