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 a0668c6..1a75cb6 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 @@ -50,7 +50,7 @@ public class CategoryController { queryWrapper .like(StrUtil.isNotBlank(dto.getFullName()), LngBCategory::getFullName, dto.getFullName()) .eq(StrUtil.isNotBlank(dto.getValid()), LngBCategory::getValid, dto.getValid()) - .orderByDesc(LngBCategory::getCode) + .orderByAsc(LngBCategory::getSort).orderByDesc(LngBCategory::getCode) .select(LngBCategory.class,x -> VoToColumnUtil.fieldsToColumns(LngBCategoryPageVo.class) .contains(x.getProperty())); IPage page = categoryService.page(ConventPage.getPage(dto), queryWrapper); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngGradeSystemItemMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngGradeSystemItemMapper.java index 291eacc..99a3b13 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngGradeSystemItemMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngGradeSystemItemMapper.java @@ -1,5 +1,6 @@ package com.xjrsoft.module.sales.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.sales.entity.LngGradeSystemItem; import org.apache.ibatis.annotations.Mapper; @@ -11,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngGradeSystemItemMapper extends MPJBaseMapper { +public interface LngGradeSystemItemMapper extends MPJBaseMapper, BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngGradeSystemMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngGradeSystemMapper.java index c6255a0..f780d9a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngGradeSystemMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngGradeSystemMapper.java @@ -1,5 +1,6 @@ package com.xjrsoft.module.sales.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.sales.entity.LngGradeSystem; import org.apache.ibatis.annotations.Mapper; @@ -11,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngGradeSystemMapper extends MPJBaseMapper { +public interface LngGradeSystemMapper extends MPJBaseMapper, BaseMapper { }