合并分支 'dev_foton_GJB' 到 'master'

Dev foton gjb 查看合并请求 laws-foton-slrs/foton-slrs-system-rest!20
2023-02-14 16:27:30 +08:00
parent 862960b3bf 9123902866
commit 957d88d058
4 changed files with 100 additions and 23 deletions
@@ -160,11 +160,9 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,

        IPage<TsPersonCollect> page = this.page(new Page<>(basePage.getPage(), basePage.getPageSize()), wrapper);
        //三天以内收藏的 标题名称后面加 new 一小时3600000  一天时间戳 为 86400000
-         long newTime = 86400000;
+         /*long newTime = 86400000;
         Date date = new Date();
         long time = date.getTime();
-
-
        for (TsPersonCollect data : page.getRecords()){
             long creationTime = data.getCreationTime().getTime();
             if(creationTime + newTime == time || creationTime + newTime > time){
@@ -172,9 +170,7 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
                 sb.append("<span style=\'color:red\'>"+"(new)"+"</span>").append(data.getCollectTitle());
                 data.setCollectTitle(sb.toString());
             }
-        }
-
-
+        }*/
        return Result.success(page);
    }