周伟鹏 / cnlive_shenhe · Commits

Commit 0cd82d4066346405ec5f4c990843d330d54d994e

Authored by 周伟鹏
1 parent 83a6ed41

审核员显示修改

Inline Side-by-side
Showing 4 changed files with 16 additions and 4 deletions
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
  View file @0cd82d4
@@ -81,7 +81,11 @@ public class CommentsController { @@ -81,7 +81,11 @@ public class CommentsController {
81 ShyUsers user = new ShyUsers(); 81 ShyUsers user = new ShyUsers();
82 user.setUser_id(auditor_id); 82 user.setUser_id(auditor_id);
83 user = usersService.select(user); 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 comment.setAuditor(auditor); 90 comment.setAuditor(auditor);
87 } 91 }
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @0cd82d4
@@ -120,7 +120,11 @@ public class VideosController { @@ -120,7 +120,11 @@ public class VideosController {
120 ShyUsers user = new ShyUsers(); 120 ShyUsers user = new ShyUsers();
121 user.setUser_id(auditor_id); 121 user.setUser_id(auditor_id);
122 user = usersService.select(user); 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 videos.setAuditor(auditor); 129 videos.setAuditor(auditor);
126 } 130 }
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
  View file @0cd82d4
@@ -123,7 +123,9 @@ public class CommentsServiceImpl { @@ -123,7 +123,9 @@ public class CommentsServiceImpl {
123 ShyUsers user = new ShyUsers(); 123 ShyUsers user = new ShyUsers();
124 user.setUser_id(auditor_id); 124 user.setUser_id(auditor_id);
125 user = shyUsersMapper.selectOne(user); 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 comment.setAuditor(auditorName); 130 comment.setAuditor(auditorName);
129 } 131 }
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
  View file @0cd82d4
@@ -116,7 +116,9 @@ public class VideosServiceImpl { @@ -116,7 +116,9 @@ public class VideosServiceImpl {
116 ShyUsers user = new ShyUsers(); 116 ShyUsers user = new ShyUsers();
117 user.setUser_id(auditor_id); 117 user.setUser_id(auditor_id);
118 user = shyUsersMapper.selectOne(user); 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 DetailsshyVideos.setAuditor(auditorName); 123 DetailsshyVideos.setAuditor(auditorName);
122 return DetailsshyVideos; 124 return DetailsshyVideos;