代码优化

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityArticleController.java

@@ -628,6 +628,7 @@ public class CommunityArticleController extends BaseController {
         try {
             communityUserLikeVos = communityArticleService.selectCommunityUserLikeList(SecurityUtils.getLoginUser().getUserId());
         } catch (Exception e) {
+            System.out.println(e.getMessage());
             throw new ProjectException();
         }
 

ruoyi-generator/src/main/java/com/ruoyi/generator/service/CommunityArticleServiceImpl.java

@@ -612,12 +612,24 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
             CommunityUserInfo userInfo = communityUserInfoMapper.selectOne(new QueryWrapper<CommunityUserInfo>().eq("user_id", communityUserLike.getUserId()));
             CommunityUserInfo likeUserInfo = communityUserInfoMapper.selectOne(new QueryWrapper<CommunityUserInfo>().eq("user_id", communityUserLike.getLikeUserId()));
             BeanUtils.copyProperties(communityUserLike, communityUserLikeVo);
-            communityUserLikeVo.setProfile(userInfo.getProfile());
-            communityUserLikeVo.setAvatar(sysUser.getAvatar());
-            communityUserLikeVo.setUsername(sysUser.getUserName());
-            communityUserLikeVo.setLikeUsername(sysUserLike.getUserName());
-            communityUserLikeVo.setLikeAvatar(sysUserLike.getAvatar());
-            communityUserLikeVo.setLikeProfile(likeUserInfo.getProfile());
+            if (Objects.nonNull(userInfo)) {
+                communityUserLikeVo.setProfile(userInfo.getProfile());
+            }
+
+            if (Objects.nonNull(likeUserInfo)) {
+                communityUserLikeVo.setLikeProfile(likeUserInfo.getProfile());
+            }
+
+            if (Objects.nonNull(sysUser)) {
+                communityUserLikeVo.setAvatar(sysUser.getAvatar());
+                communityUserLikeVo.setUsername(sysUser.getUserName());
+            }
+
+            if (Objects.nonNull(sysUserLike)) {
+                communityUserLikeVo.setLikeUsername(sysUserLike.getUserName());
+                communityUserLikeVo.setLikeAvatar(sysUserLike.getAvatar());
+            }
+
             communityUserLikeVos.add(communityUserLikeVo);
         }
         return communityUserLikeVos;
@@ -646,12 +658,24 @@ public class CommunityArticleServiceImpl extends ServiceImpl<CommunityArticleMap
             BeanUtils.copyProperties(communityUserLike, communityUserLikeVo);
             SysUser sysUser = sysUserMapper.selectUserById(communityUserLike.getUserId());
 
-            communityUserLikeVo.setProfile(userInfo.getProfile());
-            communityUserLikeVo.setAvatar(sysUser.getAvatar());
-            communityUserLikeVo.setUsername(sysUser.getUserName());
-            communityUserLikeVo.setLikeUsername(sysUserLike.getUserName());
-            communityUserLikeVo.setLikeAvatar(sysUserLike.getAvatar());
-            communityUserLikeVo.setLikeProfile(likeUserInfo.getProfile());
+            if (Objects.nonNull(sysUser)) {
+                communityUserLikeVo.setAvatar(sysUser.getAvatar());
+                communityUserLikeVo.setUsername(sysUser.getUserName());
+            }
+
+            if (Objects.nonNull(userInfo)){
+                communityUserLikeVo.setProfile(userInfo.getProfile());
+            }
+
+            if (Objects.nonNull(sysUserLike)){
+                communityUserLikeVo.setLikeUsername(sysUserLike.getUserName());
+                communityUserLikeVo.setLikeAvatar(sysUserLike.getAvatar());
+            }
+
+            if (Objects.nonNull(likeUserInfo)){
+                communityUserLikeVo.setLikeProfile(likeUserInfo.getProfile());
+            }
+
             communityUserLikeVos.add(communityUserLikeVo);
         }
         return communityUserLikeVos;