|
@@ -730,7 +730,7 @@ public class CommunityArticleController extends BaseController {
|
|
|
@ApiOperation("获取用户信息")
|
|
|
@GetMapping("/userInfo")
|
|
|
@Anonymous
|
|
|
- public AjaxResult userInfo(@RequestParam(required = false) Long userId,@RequestParam(defaultValue = "true") boolean isToken) {
|
|
|
+ public AjaxResult userInfo(@RequestParam(required = false) Long userId,boolean isToken) {
|
|
|
if (Objects.isNull(userId)) {
|
|
|
userId = SecurityUtils.getLoginUser().getUserId();
|
|
|
|
|
@@ -744,7 +744,7 @@ public class CommunityArticleController extends BaseController {
|
|
|
|
|
|
CommunityUserInfoVo communityUserInfoVo = null;
|
|
|
try {
|
|
|
- communityUserInfoVo = communityArticleService.selectCommunityUserInfoById(userId, isToken);
|
|
|
+ communityUserInfoVo = communityArticleService.selectCommunityUserInfoById(userId,isToken);
|
|
|
} catch (Exception e) {
|
|
|
System.out.println(e.getMessage());
|
|
|
throw new ProjectException();
|
|
@@ -979,6 +979,7 @@ public class CommunityArticleController extends BaseController {
|
|
|
return AjaxResult.success(communityCollection);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
* 更新合集信息
|
|
|
*
|
|
@@ -1148,7 +1149,7 @@ public class CommunityArticleController extends BaseController {
|
|
|
@ApiOperation("查询用户合集")
|
|
|
@GetMapping("/getCollection")
|
|
|
@Anonymous
|
|
|
- public AjaxResult getCollection(Long collectionId, Long searchType, @RequestParam(required = false) Long userId) {
|
|
|
+ public AjaxResult getCollection(Long collectionId, Long searchType,@RequestParam(required = false) Long userId) {
|
|
|
if (Objects.isNull(collectionId)) {
|
|
|
return AjaxResult.error("合集不存在!");
|
|
|
}
|
|
@@ -1160,7 +1161,7 @@ public class CommunityArticleController extends BaseController {
|
|
|
List<CommunityCollectionArticleVo> collectionArticleVos = null;
|
|
|
JSONArray jsonArray;
|
|
|
try {
|
|
|
- jsonArray = communityCollectionService.selectArticleInfoInCollection(userId, collectionId, searchType);
|
|
|
+ jsonArray = communityCollectionService.selectArticleInfoInCollection(userId,collectionId, searchType);
|
|
|
} catch (Exception e) {
|
|
|
System.out.println(e.getMessage());
|
|
|
throw new ProjectException();
|