diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCategoryServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCategoryServiceImpl.java index 57bee00..251a894 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCategoryServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiCategoryServiceImpl.java @@ -7,6 +7,7 @@ import com.ruoyi.busi.mapper.BusiCategoryMapper; import com.ruoyi.busi.service.IBusiCategoryService; import com.ruoyi.busi.vo.BusiCategoryVO; import com.ruoyi.common.core.domain.DlBaseEntity; +import com.ruoyi.common.utils.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,8 +42,11 @@ public class BusiCategoryServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(DlBaseEntity::getDelFlag,0) - .eq(BusiCategory::getTenantId,category.getTenantId()); - + .eq(BusiCategory::getTenantId,category.getTenantId()) + .orderByAsc(DlBaseEntity::getCreateTime); + if (StringUtils.isEmpty(category.getCatgName())) { + lambdaQueryWrapper.like(BusiCategory::getCatgName,category.getCatgName()); + } List list = list(lambdaQueryWrapper); return buildCategoryTree(list); } diff --git a/dl_vue/src/views/busi/category/form/categoryForm.vue b/dl_vue/src/views/busi/category/form/categoryForm.vue index 3c294f6..c41d174 100644 --- a/dl_vue/src/views/busi/category/form/categoryForm.vue +++ b/dl_vue/src/views/busi/category/form/categoryForm.vue @@ -3,17 +3,17 @@
- + - + - + + + + + +