浏览代码

quick update for esc combo

master
cyril.tsui 3 个月前
父节点
当前提交
2567890e2d
共有 2 个文件被更改,包括 2 次插入2 次删除
  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 查看文件

@@ -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 查看文件

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

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

正在加载...
取消
保存