Pārlūkot izejas kodu

quick update for esc combo

master
cyril.tsui pirms 3 mēnešiem
vecāks
revīzija
2567890e2d
2 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. +1
    -1
      src/main/java/com/ffii/fpsms/modules/user/entity/UserRepository.java
  2. +1
    -1
      src/main/java/com/ffii/fpsms/modules/user/service/UserService.java

+ 1
- 1
src/main/java/com/ffii/fpsms/modules/user/entity/UserRepository.java Parādīt failu

@@ -14,5 +14,5 @@ public interface UserRepository extends AbstractRepository<User, Long> {

Optional<User> findByUsernameAndDeletedFalse(String username);

List<UserCombo> findUserComboByTitleNotNullAndDepartmentNotNull();
List<UserCombo> findUserComboByTitleNotNullAndDepartmentNotNullAndNameNotNullAndDeletedFalse();
}

+ 1
- 1
src/main/java/com/ffii/fpsms/modules/user/service/UserService.java Parādīt failu

@@ -272,6 +272,6 @@ public class UserService extends AbstractBaseEntityService<User, Long, UserRepos
}

public List<UserCombo> getEscalationCombo() {
return userRepository.findUserComboByTitleNotNullAndDepartmentNotNull();
return userRepository.findUserComboByTitleNotNullAndDepartmentNotNullAndNameNotNullAndDeletedFalse();
}
}

Notiek ielāde…
Atcelt
Saglabāt