diff --git a/src/main/java/club/joylink/rtss/services/permission/OldPermissionDataSyncService.java b/src/main/java/club/joylink/rtss/services/permission/OldPermissionDataSyncService.java index b22a5d623..2987eb4f8 100644 --- a/src/main/java/club/joylink/rtss/services/permission/OldPermissionDataSyncService.java +++ b/src/main/java/club/joylink/rtss/services/permission/OldPermissionDataSyncService.java @@ -142,9 +142,7 @@ public class OldPermissionDataSyncService { if(Objects.isNull(d.getForever())){ d.setForever(false); } - if(d.getForever()){ - newList.add(d); - }else if(d.getEndTime().isAfter(LocalDateTime.now())){ + if(d.getForever() || d.getEndTime().isAfter(LocalDateTime.now())){ newList.add(d); } // newList.add(d); @@ -248,6 +246,7 @@ public class OldPermissionDataSyncService { continue; } PermissionSubject ps = SyncConvertUtil.convertSyncSubjectFromUserPermissionVO(userPermissionVO); + psList.add(ps); } return psList; diff --git a/src/main/java/club/joylink/rtss/vo/permission/sync/UserPermissionVO.java b/src/main/java/club/joylink/rtss/vo/permission/sync/UserPermissionVO.java index 8347c34fe..dc242419a 100644 --- a/src/main/java/club/joylink/rtss/vo/permission/sync/UserPermissionVO.java +++ b/src/main/java/club/joylink/rtss/vo/permission/sync/UserPermissionVO.java @@ -21,6 +21,8 @@ public class UserPermissionVO { private LocalDateTime createTime; private LocalDateTime updateTime; + private LocalDateTime userPermissionCreateTime; + private String remarks; private Long creatorId; //PermissionTypeEnum diff --git a/src/main/resources/mybatis/mapper/permission/SyncDAO.xml b/src/main/resources/mybatis/mapper/permission/SyncDAO.xml index e958a594f..4355363ca 100644 --- a/src/main/resources/mybatis/mapper/permission/SyncDAO.xml +++ b/src/main/resources/mybatis/mapper/permission/SyncDAO.xml @@ -4,7 +4,7 @@