From 8b1151c11348d701d15b4902254ac3653dc69ae1 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 31 Mar 2023 17:58:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/meeting/entity/vo/MeetingDetailBasicVO.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingDetailBasicVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingDetailBasicVO.java index 76a98eb..b5ed097 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingDetailBasicVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingDetailBasicVO.java @@ -43,6 +43,10 @@ public class MeetingDetailBasicVO { @JSONField(format = "yyyy-MM-dd HH:mm") private LocalDateTime startTime; + @ApiModelProperty("结束时间") + @JSONField(format = "yyyy-MM-dd HH:mm") + private LocalDateTime endTime; + @ApiModelProperty("评委到场时间") @JSONField(format = "yyyy-MM-dd HH:mm") private LocalDateTime judgesAttendanceTime; From 2871022011bad03d403576fa0835ee933edfd8a0 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Fri, 31 Mar 2023 18:08:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java index 8d292e1..0469fdf 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java @@ -234,9 +234,11 @@ public class ProjectLibManage { case VISITOR: //访客可以看全市的 break; + case DASHBOARD: + break; default: //没有权限的话 就让它查不到 - query.eq(Project::getId,"NULL"); + query.eq(Project::getId,0L); break; } return loginUser; From 5da2f8aeae23bf109c978be15c4a83088bb47689 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Fri, 31 Mar 2023 18:20:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=20asd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/NotifyManage.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/NotifyManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/NotifyManage.java index 0ca8fa0..6318e17 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/NotifyManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/NotifyManage.java @@ -39,7 +39,8 @@ public class NotifyManage { .eq(Objects.nonNull(notifyListReq.getReaded()), Notify::getReaded, notifyListReq.getReaded()) .eq(Notify::getUserId, userId) .like(Objects.nonNull(notifyListReq.getTitle()), Notify::getTitle, notifyListReq.getTitle()) - .eq(Objects.nonNull(notifyListReq.getType()), Notify::getType, notifyListReq.getType()); + .eq(Objects.nonNull(notifyListReq.getType()), Notify::getType, notifyListReq.getType()) + .orderByDesc(Notify::getCreateTime); notifyService.page(page,wrapper); if(page.getTotal() == 0L){ return PageVo.empty();