diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CategoryController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CategoryController.java index 4b08ccf..9105575 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CategoryController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CategoryController.java @@ -60,7 +60,7 @@ public class CategoryController { .like(StrUtil.isNotBlank(dto.getCode()),LngBCategory::getCode,dto.getCode()) .like(StrUtil.isNotBlank(dto.getUnitCode()),LngBCategory::getUnitCode,dto.getUnitCode()) .eq(ObjectUtil.isNotNull(dto.getCoefficient()),LngBCategory::getCoefficient,dto.getCoefficient()) - .like(StrUtil.isNotBlank(dto.getSort()),LngBCategory::getSort,dto.getSort()) + //.like(StrUtil.isNotBlank(dto.getSort()),LngBCategory::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getNote()),LngBCategory::getNote,dto.getNote()) .orderByDesc(LngBCategory::getId) .select(LngBCategory.class,x -> VoToColumnUtil.fieldsToColumns(LngBCategoryPageVo.class).contains(x.getProperty())); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java index 2e72bd8..941a42a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java @@ -66,7 +66,7 @@ public class LNGStationController { .like(StrUtil.isNotBlank(dto.getAddrMail()),LngBStationLng::getAddrMail,dto.getAddrMail()) .like(StrUtil.isNotBlank(dto.getOwnSign()),LngBStationLng::getOwnSign,dto.getOwnSign()) .like(StrUtil.isNotBlank(dto.getOnlineSign()),LngBStationLng::getOnlineSign,dto.getOnlineSign()) - .like(StrUtil.isNotBlank(dto.getSort()),LngBStationLng::getSort,dto.getSort()) + //.like(StrUtil.isNotBlank(dto.getSort()),LngBStationLng::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getValid()),LngBStationLng::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getNote()),LngBStationLng::getNote,dto.getNote()) .orderByAsc(LngBStationLng::getCode) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PortController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PortController.java index 6dd95eb..db4204a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PortController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PortController.java @@ -67,7 +67,7 @@ public class PortController { .like(StrUtil.isNotBlank(dto.getLimit2()),LngBPort::getLimit2,dto.getLimit2()) .like(StrUtil.isNotBlank(dto.getLimit3()),LngBPort::getLimit3,dto.getLimit3()) .like(StrUtil.isNotBlank(dto.getLimit4()),LngBPort::getLimit4,dto.getLimit4()) - .like(StrUtil.isNotBlank(dto.getSort()),LngBPort::getSort,dto.getSort()) + //.like(StrUtil.isNotBlank(dto.getSort()),LngBPort::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getNote()),LngBPort::getNote,dto.getNote()) .orderByDesc(LngBPort::getId) .select(LngBPort.class,x -> VoToColumnUtil.fieldsToColumns(LngBPortPageVo.class).contains(x.getProperty()));