|
|
@@ -710,7 +710,15 @@ public class CorpsDescController extends BladeController {
|
|
|
}
|
|
|
}
|
|
|
LambdaQueryWrapper<CorpsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
- lambdaQueryWrapper.like(Func.isNotEmpty(corpsDesc.getCname()), CorpsDesc::getCname, corpsDesc.getCname());
|
|
|
+ if (ObjectUtils.isNotNull(corpsDesc.getCname())) {
|
|
|
+ String[] arr = corpsDesc.getCname().split(" ");
|
|
|
+ for (String item : arr) {
|
|
|
+ lambdaQueryWrapper.like(CorpsDesc::getCname, item);
|
|
|
+ lambdaQueryWrapper.and(i -> i.like(CorpsDesc::getCname, item)
|
|
|
+ .or().like(CorpsDesc::getCode, item)
|
|
|
+ .or().like(CorpsDesc::getShortName, item));
|
|
|
+ }
|
|
|
+ }
|
|
|
lambdaQueryWrapper.like(Func.isNotEmpty(corpsDesc.getCode()), CorpsDesc::getCode, corpsDesc.getCode());
|
|
|
lambdaQueryWrapper.in(CollectionUtils.isNotEmpty(corpsDesc.getTypeList()), CorpsDesc::getId, corpsDesc.getTypeList());
|
|
|
lambdaQueryWrapper.eq(CorpsDesc::getIsDeleted, 0);
|