修复普测调整带来的其他功能bug
This commit is contained in:
@@ -93,7 +93,7 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
|
||||
DateUtil.beginOfDay(DateUtil.parse(surveyTestQueryParam.getSearchBeginTime())),
|
||||
DateUtil.endOfDay(DateUtil.parse(surveyTestQueryParam.getSearchEndTime())));
|
||||
//根据工程名称模糊搜索
|
||||
if (StrUtil.isNotBlank(surveyTestQueryParam.getSearchValue())) {
|
||||
if (Objects.nonNull(surveyTestQueryParam.getSearchValue())) {
|
||||
LambdaQueryWrapper<SurveyPlan> surveyPlanLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
surveyPlanLambdaQueryWrapper.eq(SurveyPlan::getState, DataStateEnum.ENABLE.getCode())
|
||||
.like(SurveyPlan::getPlanName, surveyTestQueryParam.getSearchValue());
|
||||
@@ -101,10 +101,10 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
|
||||
if (CollectionUtil.isNotEmpty(surveyPlans)) {
|
||||
List<String> planIds = surveyPlans.stream().map(SurveyPlan::getId).collect(Collectors.toList());
|
||||
surveyTestVOQueryWrapper.in("supervision_survey_test.plan_id", planIds);
|
||||
}else {
|
||||
//没有匹配的。直接返回
|
||||
return new Page<>();
|
||||
}
|
||||
} else {
|
||||
//没有匹配的。直接返回
|
||||
return new Page<>();
|
||||
}
|
||||
}
|
||||
//获取当前用户部门所有同事的id,查看该部门下所有的数据
|
||||
|
||||
Reference in New Issue
Block a user