修改字段

liwei2917
1 parent 4baea1b6
Showing 4 changed files with 7 additions and 7 deletions
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
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
@@ -53,7 +53,7 @@ public class CommentsController {
      */
     @GetMapping("/page")
     public String getPage(Model model, String activity_id, String content, Integer is_hot,
-                          String start_date, String end_date, String state, Boolean receive,
+                          String start_date, String end_date, String state, Integer receive,
                           Integer page, Integer pageSize, String orderByClause, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer spid = sessionUser.getSpid();
@@ -112,7 +112,7 @@ public class VideosController {
      * @return
      */
     @GetMapping("/page")
-    public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Boolean receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, HttpSession session) {
+    public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer spid = sessionUser.getSpid();
         String userId = sessionUser.getUserId();
@@ -153,7 +153,7 @@ public class VideosController {
         String state1 = state == null ? "" : state.toString();
         String receive1 = "";
         if (CommonUtils.isNotNull(receive)) {
-            receive1 = receive ? "true" : "false";
+            receive1 = receive==CommonConst.RECEIVE_AFTER ? "true" : "false";
         } else {
             receive1 = "";
         }
@@ -75,7 +75,7 @@ public class CommentsServiceImpl {
         return shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
     }
-    public PageInfo<ShyComments> getPage(String activity_id, String content, Integer is_hot, Date start_date, Date end_date, String states, Boolean receive, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId) {
+    public PageInfo<ShyComments> getPage(String activity_id, String content, Integer is_hot, Date start_date, Date end_date, String states, Integer receive, String updater, Integer page, Integer pageSize, String orderByClause, Integer spid, String userId) {
         Example example = new Example(ShyComments.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(orderByClause)) {
@@ -104,7 +104,7 @@ public class CommentsServiceImpl {
         }
         if (CommonUtils.isNotNull(receive)) {
             criteria.andEqualTo("receive", receive);
-            if (receive) {
+            if (receive==CommonConst.RECEIVE_AFTER) {
                 criteria.andEqualTo("receive_user_id", userId);
             }
         }
@@ -112,7 +112,7 @@ public class VideosServiceImpl {
         return shyVideosMapper.updateByPrimaryKey(shyVideos);
     }
-    public PageInfo<ShyVideos> getListContent(String video_title, String start_date, String end_date, Integer state, Boolean receive, Integer page, Integer pageSize, String video_priority, String orderByClause, Integer spid, String userId) {
+    public PageInfo<ShyVideos> getListContent(String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, Integer spid, String userId) {
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
@@ -149,7 +149,7 @@ public class VideosServiceImpl {
         if (CommonUtils.isNotNull(receive)) {
             criteria.andEqualTo("receive", receive);
             criteria2.andEqualTo("receive", receive);
-            if (receive == true) {
+            if (receive == CommonConst.RECEIVE_AFTER) {
                 criteria.andEqualTo("receive_user_id", userId);
                 criteria2.andEqualTo("receive_user_id", userId);
             }