|
|
@@ -99,10 +99,12 @@ public class BPortsController extends BladeController {
|
|
|
.like(ObjectUtils.isNotNull(bPorts.getCode()), BPorts::getCode, bPorts.getCode())
|
|
|
.and(ObjectUtils.isNotNull(bPorts.getCnName()), i -> i.like(BPorts::getCode, bPorts.getCnName()).or()
|
|
|
.like(BPorts::getCnName, bPorts.getCnName()).or()
|
|
|
- .like(BPorts::getEnName, bPorts.getCnName()))
|
|
|
+ .like(BPorts::getEnName, bPorts.getCnName()).or()
|
|
|
+ .like(BPorts::getUnCode, bPorts.getCnName()))
|
|
|
.and(ObjectUtils.isNotNull(bPorts.getEnName()), i -> i.like(BPorts::getCode, bPorts.getEnName()).or()
|
|
|
.like(BPorts::getCnName, bPorts.getEnName()).or()
|
|
|
- .like(BPorts::getEnName, bPorts.getEnName()))
|
|
|
+ .like(BPorts::getEnName, bPorts.getEnName())).or()
|
|
|
+ .like(BPorts::getUnCode, bPorts.getEnName())
|
|
|
.like(ObjectUtils.isNotNull(bPorts.getStatus()), BPorts::getStatus, bPorts.getStatus());
|
|
|
String status = sysClient.getParamService("basic.data.sort");
|
|
|
if ("name".equals(status)) {
|