Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -90,12 +90,24 @@ public class PlanYearsServiceImpl implements PlanYearsService {
             int size = 200;
             while (size == 200) {
                 LambdaQueryWrapper<PlanYears> lw = new LambdaQueryWrapper<PlanYears>();
-                lw.like(PlanYears::getProjectName, vo.getProjectName());
-                lw.eq(PlanYears::getPurchaseServices, vo.getPurchaseServices());
-                lw.eq(PlanYears::getIsExcess, vo.getIsExcess());
-                lw.eq(PlanYears::getProjectStatus, vo.getProjectStatus());
-                lw.ge(PlanYears::getPlanDemandSubTime, vo.getBeginTime());
-                lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
+                if (!ObjectUtils.isEmpty(vo.getProjectName())) {
+                    lw.like(PlanYears::getProjectName, vo.getProjectName());
+                }
+                if (!ObjectUtils.isEmpty(vo.getPurchaseServices())) {
+                    lw.eq(PlanYears::getPurchaseServices, vo.getPurchaseServices());
+                }
+                if (!ObjectUtils.isEmpty(vo.getIsExcess())) {
+                    lw.eq(PlanYears::getIsExcess, vo.getIsExcess());
+                }
+                if (!ObjectUtils.isEmpty(vo.getProjectStatus())) {
+                    lw.eq(PlanYears::getProjectStatus, vo.getProjectStatus());
+                }
+                if (!ObjectUtils.isEmpty(vo.getBeginTime())) {
+                    lw.ge(PlanYears::getPlanDemandSubTime, vo.getBeginTime());
+                }
+                if (!ObjectUtils.isEmpty(vo.getEndTime())) {
+                    lw.le(PlanYears::getPlanDemandSubTime, vo.getEndTime());
+                }
                 Page<PlanYears> page = planYearsMapper.selectPage(new Page<PlanYears>(num, size, false), lw);
                 list.addAll(page.getRecords());
                 size = page.getRecords().size();