Commit 0cd82d4066346405ec5f4c990843d330d54d994e

Authored by 周伟鹏
1 parent 83a6ed41

审核员显示修改

src/main/java/com/cnlive/shenhe/controller/CommentsController.java
... ... @@ -81,7 +81,11 @@ public class CommentsController {
81 81 ShyUsers user = new ShyUsers();
82 82 user.setUser_id(auditor_id);
83 83 user = usersService.select(user);
84   - if (CommonUtils.isNotNull(user)) auditor = user.getUsername() + user.getEmail();
  84 + if (CommonUtils.isNotNull(user)) {
  85 + String userName = CommonUtils.isEmpty(user.getUsername())?"":user.getUsername();
  86 + String email = CommonUtils.isEmpty(user.getEmail())?"":user.getEmail();
  87 + auditor = userName + email;
  88 + }
85 89 }
86 90 comment.setAuditor(auditor);
87 91 }
... ...
src/main/java/com/cnlive/shenhe/controller/VideosController.java
... ... @@ -120,7 +120,11 @@ public class VideosController {
120 120 ShyUsers user = new ShyUsers();
121 121 user.setUser_id(auditor_id);
122 122 user = usersService.select(user);
123   - if (CommonUtils.isNotNull(user)) auditor = user.getUsername() + user.getEmail();
  123 + if (CommonUtils.isNotNull(user)) {
  124 + String userName = CommonUtils.isEmpty(user.getUsername())?"":user.getUsername();
  125 + String email = CommonUtils.isEmpty(user.getEmail())?"":user.getEmail();
  126 + auditor = userName + email;
  127 + }
124 128 }
125 129 videos.setAuditor(auditor);
126 130 }
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
... ... @@ -123,7 +123,9 @@ public class CommentsServiceImpl {
123 123 ShyUsers user = new ShyUsers();
124 124 user.setUser_id(auditor_id);
125 125 user = shyUsersMapper.selectOne(user);
126   - auditorName = user.getUsername() + user.getEmail();
  126 + String userName = CommonUtils.isEmpty(user.getUsername())?"":user.getUsername();
  127 + String email = CommonUtils.isEmpty(user.getEmail())?"":user.getEmail();
  128 + auditorName = userName + email;
127 129 }
128 130 comment.setAuditor(auditorName);
129 131 }
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
... ... @@ -116,7 +116,9 @@ public class VideosServiceImpl {
116 116 ShyUsers user = new ShyUsers();
117 117 user.setUser_id(auditor_id);
118 118 user = shyUsersMapper.selectOne(user);
119   - auditorName = user.getUsername() + user.getEmail();
  119 + String userName = CommonUtils.isEmpty(user.getUsername())?"":user.getUsername();
  120 + String email = CommonUtils.isEmpty(user.getEmail())?"":user.getEmail();
  121 + auditorName = userName + email;
120 122 }
121 123 DetailsshyVideos.setAuditor(auditorName);
122 124 return DetailsshyVideos;
... ...