|
@@ -54,22 +54,22 @@ public class ManageServiceImpl implements ManageService {
|
|
|
public Predicate toPredicate(Root<Manage> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
|
|
|
|
|
|
List<Predicate> predicates = new ArrayList<>();
|
|
|
- if(Objects.nonNull(manageVO.getToProjectId()) && 0 == manageVO.getToProjectId()){
|
|
|
+ if(Objects.nonNull(manageVO.getToProjectId()) && 0 != manageVO.getToProjectId()){
|
|
|
predicates.add(criteriaBuilder.equal(root.get("toProjectId"), manageVO.getToProjectId()));
|
|
|
}
|
|
|
- if(Objects.nonNull(manageVO.getToDeptId()) && 0 == manageVO.getToDeptId()){
|
|
|
+ if(Objects.nonNull(manageVO.getToDeptId()) && 0 != manageVO.getToDeptId()){
|
|
|
predicates.add(criteriaBuilder.equal(root.get("toDeptId"), manageVO.getToProjectId()));
|
|
|
}
|
|
|
- if(Objects.nonNull(manageVO.getProductId()) && 0 == manageVO.getProductId()){
|
|
|
+ if(Objects.nonNull(manageVO.getProductId()) && 0 != manageVO.getProductId()){
|
|
|
predicates.add(criteriaBuilder.equal(root.get("productId"), manageVO.getProductId()));
|
|
|
}
|
|
|
- if(Objects.nonNull(manageVO.getProductId()) && 0 == manageVO.getProductId()){
|
|
|
- predicates.add(criteriaBuilder.equal(root.get("projectId"), manageVO.getProductId()));
|
|
|
+ if(Objects.nonNull(manageVO.getProjectId()) && 0 != manageVO.getProjectId()){
|
|
|
+ predicates.add(criteriaBuilder.equal(root.get("projectId"), manageVO.getProjectId()));
|
|
|
}
|
|
|
if(Objects.nonNull(manageVO.getType())){
|
|
|
predicates.add(criteriaBuilder.equal(root.get("type"), manageVO.getType()));
|
|
|
}
|
|
|
- if(Objects.nonNull(manageVO.getCostTypeId()) && 0 == manageVO.getCostTypeId()){
|
|
|
+ if(Objects.nonNull(manageVO.getCostTypeId()) && 0 != manageVO.getCostTypeId()){
|
|
|
predicates.add(criteriaBuilder.equal(root.get("costTypeId"), manageVO.getCostTypeId()));
|
|
|
}
|
|
|
if(Objects.nonNull(manageVO.getIncomeStatus())){
|