|
@@ -34,11 +34,13 @@ public class PreventDetectionServiceImpl extends ServiceImpl<PreventDetectionMap
|
|
|
|
|
|
@Override
|
|
|
public List<PreventDetection> getPreventDetectionScreen(String farmCode) {
|
|
|
- List<String> farmCodes = Arrays.asList();
|
|
|
+ List<String> farmCodes = new ArrayList<>();
|
|
|
//没传farmId
|
|
|
- if (StringUtils.isBlank(farmCode)){
|
|
|
+ if (StringUtils.isBlank(farmCode) ||"0".equals(farmCode)){
|
|
|
List<SysFarm> sysFarms = sysFarmMapper.selectList(null);
|
|
|
farmCodes = sysFarms.stream().map(SysFarm::getFarmCode).collect(Collectors.toList());
|
|
|
+ }else {
|
|
|
+ farmCodes.add(farmCode);
|
|
|
}
|
|
|
QueryWrapper<PreventDetection> wrapper = new QueryWrapper<>();
|
|
|
wrapper.in("farm_code",farmCodes);
|