diff --git a/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java b/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java index 3b26f21..201efa6 100644 --- a/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java +++ b/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java @@ -36,24 +36,37 @@ public class PageParam implements Serializable { private Integer pageSize = PAGE_SIZE; /** - * 排序字段 + * 排序字段(默认 id) */ - private String sortField = "id"; + private String orderByColumn = "id"; /** - * 排序方向:asc(升序)/ desc(降序) + * 排序方向:仅支持 asc(升序)/ desc(降序),默认 desc */ - private String sortOrder = "desc"; + private String isAsc = "desc"; /** - * isAsc=true(升序) + * 排序方向布尔值:true=asc,false=desc(与 isAsc 联动,无需前端传递) */ - private Boolean isAsc = true; - /*执行该排序逻辑*/ - private Boolean sortCondition = true; + private Boolean sortAsc = true; + public void setIsAsc(String isAsc) { + // 步骤1:处理空值/空白字符串 → 直接设为默认 desc + if (!StringUtils.hasText(isAsc)) { + this.isAsc = "desc"; + this.sortAsc = false; + return; + } - public void setSortOrder(String sortOrder) { - this.sortOrder = StringUtils.hasText(sortOrder) ? sortOrder.trim() : "desc"; - this.isAsc = "asc".equalsIgnoreCase(this.sortOrder); + // 步骤2:去空格并转为小写,判断是否为合法值 + String trimmedIsAsc = isAsc.trim().toLowerCase(); + if ("asc".equals(trimmedIsAsc) || "desc".equals(trimmedIsAsc)) { + // 合法值:直接赋值并同步 sortAsc + this.isAsc = trimmedIsAsc; + this.sortAsc = "asc".equals(trimmedIsAsc); + } else { + // 非法值:兜底为 desc,同步 sortAsc 为 false + this.isAsc = "desc"; + this.sortAsc = false; + } } } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/wasterecord/WasteRecordDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/wasterecord/WasteRecordDO.java index 25ccb62..60598d2 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/wasterecord/WasteRecordDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/wasterecord/WasteRecordDO.java @@ -17,7 +17,7 @@ import java.util.List; * * @author 超级管理员 */ -@TableName("garden_waste_record") +@TableName(value ="garden_waste_record" , autoResultMap = true) @KeySequence("garden_waste_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 @Data @EqualsAndHashCode(callSuper = true) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/departmentcost/DepartmentCostMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/departmentcost/DepartmentCostMapper.java index f439c04..82fca3b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/departmentcost/DepartmentCostMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/departmentcost/DepartmentCostMapper.java @@ -29,8 +29,8 @@ public interface DepartmentCostMapper extends BaseMapperX { .eqIfPresent(DepartmentCostDO::getDeptId, reqVO.getDeptId()) .eqIfPresent(DepartmentCostDO::getRemark, reqVO.getRemark()) .betweenIfPresent(DepartmentCostDO::getCreateTime, reqVO.getCreateTime()) - .orderBy(reqVO.getSortCondition(), reqVO.getIsAsc(), - DepartmentCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getSortField()) + .orderBy(true, reqVO.getSortAsc(), + DepartmentCostPageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn()) ) ); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/rentalmechanicalcost/RentalMechanicalCostMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/rentalmechanicalcost/RentalMechanicalCostMapper.java index 5838f35..2720619 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/rentalmechanicalcost/RentalMechanicalCostMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/rentalmechanicalcost/RentalMechanicalCostMapper.java @@ -35,8 +35,8 @@ public interface RentalMechanicalCostMapper extends BaseMapperX { .eqIfPresent(WasteRecordDO::getRemark, reqVO.getRemark()) .betweenIfPresent(WasteRecordDO::getCreateTime, reqVO.getCreateTime()) //.orderByDesc(WasteRecordDO::getId)); - .orderBy(reqVO.getSortCondition(), reqVO.getIsAsc(), - WasteRecordPageReqVO.SORT_FIELD_MAP.get(reqVO.getSortField()) + .orderBy(true, reqVO.getSortAsc(), + WasteRecordPageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn()) ) ); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/waterfee/WaterFeeMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/waterfee/WaterFeeMapper.java index ea93d3e..3ea92a7 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/waterfee/WaterFeeMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/waterfee/WaterFeeMapper.java @@ -30,8 +30,8 @@ public interface WaterFeeMapper extends BaseMapperX { .eqIfPresent(WaterFeeDO::getCompanyId, reqVO.getCompanyId()) .betweenIfPresent(WaterFeeDO::getCreateTime, reqVO.getCreateTime()) //.orderByDesc(WaterFeeDO::getId)); - .orderBy(reqVO.getSortCondition(), reqVO.getIsAsc(), - WaterFeePageReqVO.SORT_FIELD_MAP.get(reqVO.getSortField()) + .orderBy(true, reqVO.getSortAsc(), + WaterFeePageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn()) ) ); }