Merge branch 'master' of git.minrow.com:reyun/saasio

src/main/java/com/reyun/model/IONotice.java

@@ -40,7 +40,7 @@ public class IONotice {
 
     private Boolean release;
 
-    private boolean isRead;
+    private Boolean isRead = false;
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -224,11 +224,11 @@ public class IONotice {
     }
 
     @Transient
-    public boolean getIsRead() {
+    public Boolean getIsRead() {
         return isRead;
     }
 
-    public void setIsRead(boolean isRead) {
+    public void setIsRead(Boolean isRead) {
         this.isRead = isRead;
     }
 }

src/main/java/com/reyun/repository/NoticeRepository.java

@@ -16,7 +16,7 @@ public interface NoticeRepository  extends JpaRepository<IONotice, Long> {
 //    @Query(value = "select * from ionotice n where n.isdeploy is true and  (io_account like %?1% or io_account = '-1') order by deploy_date desc", nativeQuery = true)
 //    List<IONotice> listRecentDeployNotice(String email);
 
-    @Query(value = "select * from ionotice n where n.isdeploy is true and n.modify_date>= ?1 and (io_account='-1' or io_account like CONCAT('%<',?2,'>%')) union select * from ionotice where is_top=1 and isdeploy is true and modify_date< ?1 and (io_account='-1' or io_account like CONCAT('%<',?2,'>%')) order by modify_date desc"
+    @Query(value = "select * from ionotice n where n.isdeploy is true and n.deploy_date>= ?1 and (io_account='-1' or io_account like CONCAT('%<',?2,'>%')) union select * from ionotice where is_top=1 and isdeploy is true and deploy_date< ?1 and (io_account='-1' or io_account like CONCAT('%<',?2,'>%')) order by deploy_date desc"
             , nativeQuery = true)
     List<IONotice> listRecentDeployNotice(String currentDate, Long rootParent);
 

src/main/java/com/reyun/service/impl/NoticeServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -38,6 +39,7 @@ public class NoticeServiceImpl implements NoticeService {
         Account account = accountRepository.findOne(accountId);
 
         List<IONotice> recentDeployNoticeList = noticeRepository.listRecentDeployNotice(DateUtil.getBeforeDays(7), account.getRootParent());
+        List<IONotice> result = new ArrayList<>();
 
         if (!CollectionUtils.isEmpty(recentDeployNoticeList)) {
 
@@ -58,9 +60,29 @@ public class NoticeServiceImpl implements NoticeService {
                     }
                 }
             }
+            List<IONotice> unreadTopList = new ArrayList<>();
+            List<IONotice> unreadNotTopList = new ArrayList<>();
+            List<IONotice> readTopList = new ArrayList<>();
+            List<IONotice> readNotTopList = new ArrayList<>();
+            for (IONotice notice : recentDeployNoticeList) {
+                boolean isread = notice.getIsRead()==null?false:notice.getIsRead();
+                if (!isread && notice.getIs_top()) {
+                    unreadTopList.add(notice);
+                } else if (!isread && !notice.getIs_top()) {
+                    unreadNotTopList.add(notice);
+                } else if (isread && notice.getIs_top()) {
+                    readTopList.add(notice);
+                } else {
+                    readNotTopList.add(notice);
+                }
+            }
+            result.addAll(unreadTopList);
+            result.addAll(unreadNotTopList);
+            result.addAll(readTopList);
+            result.addAll(readNotTopList);
         }
 
-        return recentDeployNoticeList;
+        return result;
     }
 
     @Override