From dfe761131162f10cfc8138e25fbcd7c8c5cd83cd Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Thu, 11 Apr 2024 21:18:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coal/weightColumnConfig/dto/WeightColumnConfigDto.java | 5 ++++- .../service/WeightColumnConfigService.java | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/WeightColumnConfigDto.java b/src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/WeightColumnConfigDto.java index 1fd2117a..fcd32eba 100644 --- a/src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/WeightColumnConfigDto.java +++ b/src/main/java/cn/lihongjie/coal/weightColumnConfig/dto/WeightColumnConfigDto.java @@ -5,4 +5,7 @@ import cn.lihongjie.coal.base.dto.OrgCommonDto; import lombok.Data; @Data -public class WeightColumnConfigDto extends OrgCommonDto {} +public class WeightColumnConfigDto extends OrgCommonDto { + + private Integer width; +} diff --git a/src/main/java/cn/lihongjie/coal/weightColumnConfig/service/WeightColumnConfigService.java b/src/main/java/cn/lihongjie/coal/weightColumnConfig/service/WeightColumnConfigService.java index 965e717f..abd0eda5 100644 --- a/src/main/java/cn/lihongjie/coal/weightColumnConfig/service/WeightColumnConfigService.java +++ b/src/main/java/cn/lihongjie/coal/weightColumnConfig/service/WeightColumnConfigService.java @@ -3,6 +3,7 @@ package cn.lihongjie.coal.weightColumnConfig.service; import cn.lihongjie.coal.base.dto.CommonQuery; import cn.lihongjie.coal.base.dto.IdRequest; import cn.lihongjie.coal.base.service.BaseService; +import cn.lihongjie.coal.common.Ctx; import cn.lihongjie.coal.dbFunctions.DbFunctionService; import cn.lihongjie.coal.weightColumnConfig.dto.CreateWeightColumnConfigDto; import cn.lihongjie.coal.weightColumnConfig.dto.UpdateWeightColumnConfigDto; @@ -78,6 +79,12 @@ public class WeightColumnConfigService query.getPageSize(), Sort.by(query.getOrders()))); + if (!page.hasContent()){ + initDefault(Ctx.currentUser().getOrganizationId()); + return list(query); + } + + return page.map(this.mapper::toDto); }