bug fix

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/impl/ManageServiceImpl.java

@@ -1,26 +1,20 @@
 package cn.efunbox.manage.base.service.impl;
 
 import cn.efunbox.manage.base.entity.*;
-import cn.efunbox.manage.base.enums.BaseStatusEnum;
-import cn.efunbox.manage.base.enums.CompanyTypeEnum;
 import cn.efunbox.manage.base.enums.IncomeStatusEnum;
-import cn.efunbox.manage.base.enums.ManageTypeEnum;
 import cn.efunbox.manage.base.repository.*;
 import cn.efunbox.manage.base.service.ManageService;
 import cn.efunbox.manage.base.vo.ManageVO;
-import cn.efunbox.manage.common.entity.page.OnePage;
 import cn.efunbox.manage.common.enums.BaseOrderEnum;
 import cn.efunbox.manage.common.helper.SortHelper;
 import cn.efunbox.manage.common.result.ApiCode;
 import cn.efunbox.manage.common.result.ApiResult;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.Mapping;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -28,8 +22,6 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import java.util.*;
 
-import static cn.efunbox.manage.base.enums.CompanyTypeEnum.COMPANY;
-
 /**
  * ManageSreviceImpl
  * Created by wangys on 2019/03/08
@@ -70,7 +62,7 @@ public class ManageServiceImpl implements ManageService {
                     predicates.add(criteriaBuilder.equal(root.get("toProjectId"), manageVO.getToProjectId()));
                 }
                 if(Objects.nonNull(manageVO.getToDeptId()) && 0 != manageVO.getToDeptId()){
-                    predicates.add(criteriaBuilder.equal(root.get("toDeptId"), manageVO.getToProjectId()));
+                    predicates.add(criteriaBuilder.equal(root.get("toDeptId"), manageVO.getToDeptId()));
                 }
                 if(Objects.nonNull(manageVO.getProductId()) && 0 != manageVO.getProductId()){
                     predicates.add(criteriaBuilder.equal(root.get("productId"), manageVO.getProductId()));
@@ -119,10 +111,10 @@ public class ManageServiceImpl implements ManageService {
                 if(Objects.nonNull(manageVO.getEndTime())){
                     predicates.add(criteriaBuilder.lessThanOrEqualTo(root.get("happenTime"), manageVO.getEndTime()));
                 }
-                if(Objects.nonNull(manageVO.getMinAmount())){
+                if(Objects.nonNull(manageVO.getMinAmount()) && manageVO.getMinAmount() > 0){
                     predicates.add(criteriaBuilder.ge(root.get("amount"), manageVO.getMinAmount()));
                 }
-                if(Objects.nonNull(manageVO.getMaxAmount())){
+                if(Objects.nonNull(manageVO.getMaxAmount()) && manageVO.getMaxAmount() > 0){
                     predicates.add(criteriaBuilder.le(root.get("amount"), manageVO.getMaxAmount()));
                 }
                 if(manageVO.getDeptIds() != null && manageVO.getDeptIds().size() > 0){