diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java index 81f734dd..730fa916 100644 --- a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java +++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java @@ -1,5 +1,6 @@ package cn.lihongjie.coal.coalWashingDailyAnalysis.service; +import cn.hutool.core.bean.BeanUtil; import cn.lihongjie.coal.base.dto.CommonQuery; import cn.lihongjie.coal.base.dto.IdRequest; import cn.lihongjie.coal.base.service.BaseService; @@ -156,7 +157,8 @@ public class CoalWashingDailyAnalysisService public CoalWashingDailyAnalysisDto updateMain(UpdateCoalWashingDailyAnalysisDto request) { CoalWashingDailyAnalysisEntity entity = this.repository.get(request.getId()); - List kfItems = entity.getKfItems(); + List kfItems = + BeanUtil.copyToList(entity.getKfItems(), CoalWashingDailyAnalysisKFItemVo.class); if (this.repository.containArchived(request.getId())) { throw new BizException("部分数据已归档,无法编辑或删除"); diff --git a/src/main/resources/scripts/dict/enum/coalWashingDailyAnalysisKFAC.groovy b/src/main/resources/scripts/dict/enum/coalWashingDailyAnalysisKFAC.groovy index aac14db7..16ed9213 100644 --- a/src/main/resources/scripts/dict/enum/coalWashingDailyAnalysisKFAC.groovy +++ b/src/main/resources/scripts/dict/enum/coalWashingDailyAnalysisKFAC.groovy @@ -12,5 +12,5 @@ def service = ioc.getBean(DictionaryService.class) -return service.autoComplete(new AutoCompleteRequest(tableName: "t_coal_washing_daily_analysis_kf_items kf inner join t_coal_washing_daily_analysis a on kf.coal_washing_daily_analysis_id = a.id", fieldName: "kf.name",organizationId: Ctx.currentUser().organizationId, query: params.get("query", null)?.asText())) +return service.autoComplete(new AutoCompleteRequest(tableName: "t_coal_washing_daily_analysis_kf_items kf inner join t_coal_washing_daily_analysis a on kf.coal_washing_daily_analysis_id = a.id", fieldName: "kf.name",organizationId: Ctx.currentUser().organizationId, query: params.get("query")?.asText()))