修复三个bug

王言钊
1 parent 0d987955
Showing 4 changed files with 36 additions and 18 deletions
pom.xml
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
@@ -247,6 +247,16 @@
                 <environment>dev</environment>
             </properties>
         </profile>
+        <!-- 测试环境 -->
+<!--        <profile>-->
+<!--            <id>test</id>-->
+<!--            <activation>-->
+<!--                <activeByDefault>false</activeByDefault>-->
+<!--            </activation>-->
+<!--            <properties>-->
+<!--                <environment>test</environment>-->
+<!--            </properties>-->
+<!--        </profile>-->
         <!-- 生产环境 -->
         <profile>
             <id>prod</id>
@@ -374,15 +374,21 @@ public class CommentsController extends BaseController {
                 /*状态需要处理成用户可读*/
                 String common_type = "";//评论类型，topic:话题
-                if (list.get(i).getType().equals(CommonConst.CATEGORY_TOPIC)) {
-                    common_type = "话题";
+                String type = list.get(i).getType();
+                if (type != null) {
+                    if (type.equals(CommonConst.CATEGORY_TOPIC)) {
+                        common_type = "话题";
+                    }
                 } else {
                     common_type = "其他";
                 }
                 cell = row.createCell(6);//列
                 cell.setCellValue(common_type);
                 cell = row.createCell(7);//列
-                cell.setCellValue(list.get(i).getLevel());
+                Integer level = list.get(i).getLevel();
+                if (level != null) {
+                    cell.setCellValue(level);
+                }
                 /*状态需要处理成用户可读*/
                 String platform = "";//评论所属的平台
                 if (list.get(i).getPlatform().equals("a")) {
@@ -347,13 +347,15 @@ public class VideosController extends BaseController {
         if (spid == 0) {
             videosDTO.setSpid(null);
         }
-        if (videosDTO.getSp_Id() != null) {
+        if (videosDTO.getSp_Id() != null && videosDTO.getSp_Id() != "") {
             videosDTO.setSpid(Integer.valueOf(videosDTO.getSp_Id()));
         }
         List<ShyVideos> shyVideosList = videosService.findByCondition(videosDTO);
         String fileName = "点播数据";
-        String updater = "";//审核员名字
-        String state1 = "";//审核状态 1已审核 2审核拒绝 0未审核
+        //审核员名字
+        String updater = "";
+        //审核状态 1已审核 2审核拒绝 0未审核
+        String state1 = "";
         XSSFWorkbook wb = new XSSFWorkbook();
         ServletOutputStream out = null;
         BufferedInputStream bis = null;
@@ -105,9 +105,9 @@ public class CommentsServiceImpl {
         if (CommonUtils.isNotNull(commentsDTO.getComment_user_id())) {
             criteria.andEqualTo("comment_user_id", commentsDTO.getComment_user_id());
         }
-        if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "0") {
+        if (CommonUtils.isNotEmpty(commentsDTO.getType()) && Integer.valueOf(commentsDTO.getType()) == 0) {
             criteria.andEqualTo("type", CommonConst.CATEGORY_TOPIC);
-        } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "1") {
+        } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && Integer.valueOf(commentsDTO.getType()) == 1) {
             criteria.andEqualTo("type", CommonConst.CATEGORY_ELSE);
         }
         if (CommonUtils.isNotEmpty(commentsDTO.getActivity_id())) {
@@ -168,9 +168,9 @@ public class CommentsServiceImpl {
         if (CommonUtils.isNotNull(commentsDTO.getIs_hot())) {
             criteria.andEqualTo("is_hot", commentsDTO.getIs_hot());
         }
-        if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "0") {
+        if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType().equals("0")) {
             criteria.andEqualTo("type", CommonConst.CATEGORY_TOPIC);
-        } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "1") {
+        } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType().equals("0")) {
             criteria.andIsNull("type");
         }
         if (CommonUtils.isNotEmpty(commentsDTO.getActivity_id())) {
@@ -183,14 +183,14 @@ public class CommentsServiceImpl {
             }
         }
-        if (CommonUtils.isNotEmpty(String.valueOf(commentsDTO.getState()))) {
-            Example.Criteria criteria1 = example.createCriteria();
-            String[] stas = String.valueOf(commentsDTO.getState()).split(",");
-            for (String s : stas) {
-                criteria1.orEqualTo("state", Integer.parseInt(s));
-            }
-            example.and(criteria1);
-        }
+        //if (CommonUtils.isNotEmpty(String.valueOf(commentsDTO.getState()))) {
+        //    Example.Criteria criteria1 = example.createCriteria();
+        //    String[] stas = String.valueOf(commentsDTO.getState()).split(",");
+        //    for (String s : stas) {
+        //        criteria1.orEqualTo("state", Integer.parseInt(s));
+        //    }
+        //    example.and(criteria1);
+        //}
         if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() != 3) {
             criteria.andEqualTo("state", commentsDTO.getState());