|
@@ -74,16 +74,11 @@ public class DemInspectListServiceImpl extends AbstractCrudService<DemInspectLis
|
|
|
|
|
|
if(CollectionUtils.isNotEmpty(comoanyList)){
|
|
if(CollectionUtils.isNotEmpty(comoanyList)){
|
|
List<String> companyList = new ArrayList<>();
|
|
List<String> companyList = new ArrayList<>();
|
|
- if (CollectionUtils.isNotEmpty(companyIdList)){
|
|
|
|
- for(int j=0;j<companyIdList.size();j++){
|
|
|
|
- companyList.add(companyIdList.get(j).getCompanyId());
|
|
|
|
- }
|
|
|
|
- }else {
|
|
|
|
- for(int j=0;j<comoanyList.size();j++){
|
|
|
|
- companyList.add(comoanyList.get(j).getCompanyId());
|
|
|
|
- }
|
|
|
|
|
|
+ for(int j=0;j<companyIdList.size();j++){
|
|
|
|
+ companyList.add(companyIdList.get(j).getCompanyId());
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
LambdaQueryWrapper<DemInspectList> QueryWrapper1 = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<DemInspectList> QueryWrapper1 = Wrappers.lambdaQuery();
|
|
if(StringUtils.isNotBlank(companyName)){
|
|
if(StringUtils.isNotBlank(companyName)){
|
|
if(CollectionUtils.isNotEmpty(companyList)){
|
|
if(CollectionUtils.isNotEmpty(companyList)){
|