diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/AuditLogRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/AuditLogRepositoryImpl.java index 5e655440..3dc3c6bc 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/AuditLogRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/AuditLogRepositoryImpl.java @@ -98,7 +98,7 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport .from(auditLogEntity) .leftJoin(menuEntity) .on(auditLogEntity.menuUid.eq(menuEntity.menuUid)) - .where(menuNameEquals(searchValue)) + .where(auditLogEntity.menuUid.ne("SYSTEM"), menuNameEquals(searchValue)) .groupBy(auditLogEntity.menuUid) .offset(pageable.getOffset()) .limit(pageable.getPageSize()) @@ -139,7 +139,7 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport .from(auditLogEntity) .leftJoin(memberEntity) .on(auditLogEntity.userUid.eq(memberEntity.id)) - .where(loginIdOrUsernameContains(searchValue)) + .where(auditLogEntity.userUid.isNotNull(), loginIdOrUsernameContains(searchValue)) .groupBy(auditLogEntity.userUid, memberEntity.employeeNo, memberEntity.name) .offset(pageable.getOffset()) .limit(pageable.getPageSize()) diff --git a/src/main/java/com/kamco/cd/kamcoback/scheduler/MapSheetMngFileJobController.java b/src/main/java/com/kamco/cd/kamcoback/scheduler/MapSheetMngFileJobController.java index c5d0cebd..e46b0f7b 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scheduler/MapSheetMngFileJobController.java +++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/MapSheetMngFileJobController.java @@ -13,12 +13,9 @@ public class MapSheetMngFileJobController { private final MapSheetMngFileJobService mapSheetMngFileJobService; // 현재 상태 확인용 Getter - @Getter - private boolean isSchedulerEnabled = false; - @Getter - private boolean isFileSyncSchedulerEnabled = false; - @Getter - private int mngSyncPageSize = 20; + @Getter private boolean isSchedulerEnabled = false; + @Getter private boolean isFileSyncSchedulerEnabled = false; + @Getter private int mngSyncPageSize = 20; // 파일싱크 진행여부 확인하기 @Scheduled(fixedDelay = 1000 * 10) @@ -33,17 +30,11 @@ public class MapSheetMngFileJobController { mng = mapSheetMngFileJobService.checkMngFileSync(); this.isFileSyncSchedulerEnabled = true; System.out.println( - "MngFileSyncJob --> mngYyyy : " - + mng - + ", currentTime : " - + System.currentTimeMillis()); + "MngFileSyncJob --> mngYyyy : " + mng + ", currentTime : " + System.currentTimeMillis()); } else { this.isFileSyncSchedulerEnabled = false; System.out.println( - "MngFileSyncJob --> mngYyyy : " - + mng - + ", currentTime : " - + System.currentTimeMillis()); + "MngFileSyncJob --> mngYyyy : " + mng + ", currentTime : " + System.currentTimeMillis()); } }