|
@@ -84,11 +84,12 @@ public class DmpDeviceTypeServiceImpl extends AbstractCrudService<DmpDeviceTypeM
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public CommonPage<DmpDeviceType> getDeviceTypeList(String typeCode, String typeName, Integer pageNum, Integer pageSize) {
|
|
|
+ public CommonPage<DmpDeviceType> getDeviceTypeList(String typeCode, String typeName, Integer typeDomain, Integer pageNum, Integer pageSize) {
|
|
|
IPage<DmpDeviceType> page = new Page<>(pageNum, pageSize);
|
|
|
LambdaQueryWrapper<DmpDeviceType> queryWrapper = Wrappers.lambdaQuery();
|
|
|
queryWrapper.like(StringUtils.isNotBlank(typeCode), DmpDeviceType::getTypeCode, typeCode)
|
|
|
- .like(StringUtils.isNotBlank(typeName), DmpDeviceType::getTypeName, typeName);
|
|
|
+ .like(StringUtils.isNotBlank(typeName), DmpDeviceType::getTypeName, typeName)
|
|
|
+ .eq(typeDomain != null,DmpDeviceType::getTypeDomain,typeDomain);
|
|
|
page = this.page(page, queryWrapper);
|
|
|
return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
|
|
|
}
|