Merge branch 'dev'

徐近程
2 parents 823af6ed 1ffdcd50
Showing 1 changed file with 11 additions and 11 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
@@ -349,7 +349,7 @@ public class VideosController extends BaseController {
             cell.setCellValue("spid");
             cell = row.createCell(16);//列
             cell.setCellValue("sp简称");
-            
+
             for (int i = 0; i < shyVideosList.size(); i++) {
                 row = sheetlist.createRow((short) (i + 1));//行
                 cell = row.createCell(0);//列
@@ -365,14 +365,14 @@ public class VideosController extends BaseController {
                 cell = row.createCell(5);//列
                 /* 审核员需要做处理*/
                 if (shyVideosList.get(i).getState() != CommonConst.AUDIT_INTT) {
-                	updater = CommonUtils.isEmpty(shyVideosList.get(i).getUpdater()) || "null".equals(shyVideosList.get(i).getUpdater())? "白名单":shyVideosList.get(i).getUpdater();
+                    updater = CommonUtils.isEmpty(shyVideosList.get(i).getUpdater()) || "null".equals(shyVideosList.get(i).getUpdater())? "白名单":shyVideosList.get(i).getUpdater();
                     String auditor_id = shyVideosList.get(i).getAuditor_id();
                     if (CommonUtils.isNotEmpty(auditor_id)) {
                         ShyUsers user = new ShyUsers();
                         user.setUser_id(auditor_id);
                         user = usersService.select(user);
                         if (CommonUtils.isNotNull(user)) {
-                        	String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
+                            String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
                             String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
                             updater = userName ;
                         }
@@ -408,17 +408,17 @@ public class VideosController extends BaseController {
                 cell = row.createCell(15);//列
                 cell.setCellValue(shyVideosList.get(i).getSpid());
                 cell = row.createCell(16);//列
-                
+
                 //显示spid简称
                 ShySites shySites = sitesService.findspidDescByspid(shyVideosList.get(i).getSpid());
                 if (CommonUtils.isNotNull(shySites)) {
-                	if(CommonUtils.isNotEmpty(shyVideosList.get(i).getCategory())&&shyVideosList.get(i).getCategory().equals(CommonConst.CATEGORY_WITNESS)){
-                		cell.setCellValue(shySites.getName()+"(目击者)");
-                	}else if(CommonUtils.isNotEmpty(shyVideosList.get(i).getCategory())&&shyVideosList.get(i).getCategory().equals(CommonConst.CATEGORY_MOMENT)){
-                		cell.setCellValue(shySites.getName()+"(朋友圈)");
-                	}else{
-                		cell.setCellValue(shySites.getName());
-                	}
+                    if(CommonUtils.isNotEmpty(shyVideosList.get(i).getCategory())&&shyVideosList.get(i).getCategory().equals(CommonConst.CATEGORY_WITNESS)){
+                        cell.setCellValue(shySites.getName()+"(目击者)");
+                    }else if(CommonUtils.isNotEmpty(shyVideosList.get(i).getCategory())&&shyVideosList.get(i).getCategory().equals(CommonConst.CATEGORY_MOMENT)){
+                        cell.setCellValue(shySites.getName()+"(朋友圈)");
+                    }else{
+                        cell.setCellValue(shySites.getName());
+                    }
                 }
             }