Merge remote-tracking branch 'origin/master'

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;

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;

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();