From fdd46a5f04006dde0b791c5919e81442da53befc Mon Sep 17 00:00:00 2001 From: luolm <470431449@qq.com> Date: Sun, 2 Mar 2025 16:50:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E7=AE=A1=E7=90=86-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/AdminBasePartService.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBasePartService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBasePartService.java index 5ef2eaad..97493e09 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBasePartService.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminBasePartService.java @@ -48,31 +48,34 @@ public class AdminBasePartService { */ public void save(BasePartDTO basePartDTO) { //保存 - if (null != basePartDTO.getId() && basePartDTO.getId() > 0) { - TBasePart ent = Convert.convert(TBasePart.class, basePartDTO); - ent.setPartNo(UniqueSequenceGenerator.generateCode(Constant.PartCodePrefix)); - ent.setCreateBy(AdminUserUtil.getUserName()); - ent.setCreateTime(LocalDateTime.now()); - ent.setUpdateBy(AdminUserUtil.getUserName()); - ent.setUpdateTime(LocalDateTime.now()); + TBasePart partEnt = Convert.convert(TBasePart.class, basePartDTO); + if (null == basePartDTO.getId() || basePartDTO.getId() <=0) { + + partEnt.setPartNo(UniqueSequenceGenerator.generateCode(Constant.PartCodePrefix)); + partEnt.setCreateBy(AdminUserUtil.getUserName()); + partEnt.setCreateTime(LocalDateTime.now()); + partEnt.setUpdateBy(AdminUserUtil.getUserName()); + partEnt.setUpdateTime(LocalDateTime.now()); } else { //修改 - TBasePart ent = Convert.convert(TBasePart.class, basePartDTO); - ent.setUpdateBy(AdminUserUtil.getUserName()); - ent.setUpdateTime(LocalDateTime.now()); + partEnt.setUpdateBy(AdminUserUtil.getUserName()); + partEnt.setUpdateTime(LocalDateTime.now()); } //删除语言 - languageDataService.removeByMap(ImmutableMap.of("source_id", basePartDTO.getId())); + partService.saveOrUpdate(partEnt); + languageDataService.removeByMap(ImmutableMap.of("source_id", partEnt.getId())); List result = new ArrayList<>(); basePartDTO.getLanguage().forEach(u -> { TBaseLanguageData ent = new TBaseLanguageData(); - ent.setSourceId(Convert.convert(Long.class, basePartDTO.getId()) ); + ent.setSourceId(Convert.convert(Long.class, partEnt.getId()) ); ent.setLanguageCode(u.getCode()); ent.setLanguageName(u.getName()); ent.setLanguageValue(u.getLanguageValue()); result.add(ent); }); - languageDataService.saveBatch(result); + if(CollUtil.isNotEmpty(result)) { + languageDataService.saveBatch(result); + } }