|
@@ -35,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.Objects;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -306,6 +307,9 @@ public class FactoryServiceImpl implements FactoryService {
|
|
if(DataLimitEnum.YES.is(req.getDataLimit())){
|
|
if(DataLimitEnum.YES.is(req.getDataLimit())){
|
|
param.eq("id", userUtil.getWholeUser().getFactoryId());
|
|
param.eq("id", userUtil.getWholeUser().getFactoryId());
|
|
}
|
|
}
|
|
|
|
+ if(req.getFactoryTypeList().contains(FactoryTypeEnum.COVER.getCode()) && Objects.nonNull(req.getIsFirstFactory())){
|
|
|
|
+ param.eq("is_first_factory", req.getIsFirstFactory());
|
|
|
|
+ }
|
|
//其他条件
|
|
//其他条件
|
|
param.in("factory_type", req.getFactoryTypeList());
|
|
param.in("factory_type", req.getFactoryTypeList());
|
|
param.eq("is_delete", 0);
|
|
param.eq("is_delete", 0);
|