周伟鹏 / cnlive_shenhe · Commits

Commit 689a53b266562e525ac87e4c98cc924496e98032

Authored by 陈浩
1 parent 4b7f7412

update

Inline Side-by-side
Showing 1 changed file with 11 additions and 8 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @689a53b
... ... @@ -10,6 +10,7 @@ import com.cnlive.shenhe.entity.ShyVideos;
10 10 import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
11 11 import com.cnlive.shenhe.serviceImpl.VideosServiceImpl;
12 12 import com.cnlive.shenhe.utils.AuditPass;
  13 +import com.cnlive.shenhe.utils.CommonConst;
13 14 import com.cnlive.shenhe.utils.CommonUtils;
14 15 import com.github.pagehelper.PageInfo;
15 16 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -100,15 +101,17 @@ public class VideosController {
100 101 List<ShyVideos> list = videoPage.getList();
101 102 if (!list.isEmpty()) {
102 103 for (ShyVideos videos : list) {
103   - String auditor = "白名单";
104   - String auditor_id = videos.getAuditor_id();
105   - if (CommonUtils.isNotEmpty(auditor_id)) {
106   - ShyUsers user = new ShyUsers();
107   - user.setUser_id(auditor_id);
108   - user = usersService.select(user);
109   - if (CommonUtils.isNotNull(user)) auditor = user.getUsername() + user.getEmail();
  104 + if (videos.getState() != CommonConst.AUDIT_INTT){
  105 + String auditor = "白名单";
  106 + String auditor_id = videos.getAuditor_id();
  107 + if (CommonUtils.isNotEmpty(auditor_id)) {
  108 + ShyUsers user = new ShyUsers();
  109 + user.setUser_id(auditor_id);
  110 + user = usersService.select(user);
  111 + if (CommonUtils.isNotNull(user)) auditor = user.getUsername() + user.getEmail();
  112 + }
  113 + videos.setAuditor(auditor);
110 114 }
111   - videos.setAuditor(auditor);
112 115 }
113 116 }
114 117 model.addAttribute("videoPage", videoPage);
... ...