Bladeren bron

解决打开文件显示ID获取异常的BUG

wukai 1 jaar geleden
bovenliggende
commit
e34ae10519

+ 10 - 0
doc-biz/src/main/java/com/doc/biz/controller/DocDirController.java

@@ -270,6 +270,16 @@ public class DocDirController extends BaseController {
         if (users.size() > 0) {
             dir.setUsers(users);
         }
+        DocFavorite favorite = new DocFavorite();
+        favorite.setOwner(SecurityUtils.getUserId());
+        favorite.setIsFolder("Y");
+        favorite.setRelaId(dirId);
+        List favorites = favoriteService.selectDocFavoriteList(favorite);
+        if (favorites.size() > 0) {
+            dir.setIsFavorite("Y");
+        } else {
+            dir.setIsFavorite("N");
+        }
         return success(dir);
     }
 

+ 1 - 12
doc-biz/src/main/java/com/doc/biz/service/impl/DocDirServiceImpl.java

@@ -45,18 +45,7 @@ public class DocDirServiceImpl implements IDocDirService {
      */
     @Override
     public DocDir selectDocDirByDirId(Long dirId) {
-        DocDir dir = docDirMapper.selectDocDirByDirId(dirId);
-        DocFavorite favorite = new DocFavorite();
-        favorite.setOwner(SecurityUtils.getUserId());
-        favorite.setIsFolder("Y");
-        favorite.setRelaId(dirId);
-        List favorites = favoriteService.selectDocFavoriteList(favorite);
-        if (favorites.size() > 0) {
-            dir.setIsFavorite("Y");
-        } else {
-            dir.setIsFavorite("N");
-        }
-        return dir;
+        return docDirMapper.selectDocDirByDirId(dirId);
     }
 
     /**

+ 2 - 1
doc-biz/src/main/resources/mapper/biz/DocFavoriteMapper.xml

@@ -37,6 +37,7 @@
             <if test="isFolder != null  and isFolder != ''">and IS_FOLDER = #{isFolder}</if>
             <if test="labelId != null  and labelId != ''">and LABEL_ID = #{labelId}</if>
             <if test="owner != null  and owner != ''">and OWNER = #{owner}</if>
+            <if test="relaId != null  and relaId != ''">and RELA_ID = #{relaId}</if>
         </where>
     </select>
 
@@ -99,4 +100,4 @@
             #{favoriteId}
         </foreach>
     </delete>
-</mapper>
+</mapper>