diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java index 0a7c48c..f2221e5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService; +import cn.estsh.i3plus.platform.common.tool.BeanCopyTool; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; @@ -72,25 +73,28 @@ public class SysLocaleResourceService implements ISysLocaleResourceService { @Override @ApiOperation(value = "修改系统资源",notes = "修改系统资源") public void updateSysLocaleResource(SysLocaleResource sysLocaleResource) { - LOGGER.info("系统资源 SYS_LOCALE_RESOURCE SysLocaleResource:{}",sysLocaleResource); - String hqlPack = CoreHqlPack.packHqlSysLocaleResourceKey(sysLocaleResource); - int count = sysLocaleResourceRDao.findByHqlWhereCount(hqlPack); - if (count > 0){ - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) - .setErrorDetail("语言资源已存在") - .setErrorSolution("请重新输入语言代码与资源键") - .build(); + SysLocaleResource originSysLocaleResource = sysLocaleResourceRDao.getById(sysLocaleResource.getId()); + LOGGER.info("系统资源 SYS_LOCALE_RESOURCE SysLocaleResource:{}", sysLocaleResource); + String hqlPack = CoreHqlPack.packHqlSysLocaleResourceKey(sysLocaleResource); + int count = sysLocaleResourceRDao.findByHqlWhereCount(hqlPack); + if (count > 0) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("语言资源已存在") + .setErrorSolution("请重新输入语言代码与资源键") + .build(); } // 设置语言名称冗余 SysLocaleLanguage sysLocaleLanguage = sysLocaleLanguageRDao.getByProperty("languageCode", sysLocaleResource.getLanguageCode()); - ValidatorBean.checkNotNull(sysLocaleLanguage,"选中的语言不存在"); + ValidatorBean.checkNotNull(sysLocaleLanguage, "选中的语言不存在"); sysLocaleResource.setLanguageNameRdd(sysLocaleLanguage.getLanguageName()); - sysLocaleResourceRDao.update(sysLocaleResource); + BeanCopyTool.beanCopy(sysLocaleResource, originSysLocaleResource); + + sysLocaleResourceRDao.update(originSysLocaleResource); } @Override