From 37dc9816dbe631ffc751cbcf43ff779ef0e8aad6 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 12 Aug 2024 10:44:53 +0800 Subject: [PATCH] =?UTF-8?q?fix(88386):=20=E6=A0=87=E5=87=86=E6=AF=94?= =?UTF-8?q?=E5=AF=B9--=E6=96=87=E6=A1=A3=E6=AF=94=E5=AF=B9=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=88=90=E5=8A=9F=E6=8F=90=E7=A4=BA=E8=AF=AD=E6=98=AF?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/util/CutUtils.java | 20 +++++++++++++++++++ .../SarFileCompareInfoController.java | 2 ++ .../SarFileCompareItemCommentController.java | 2 ++ .../FileSplitItemsEOController.java | 2 ++ .../impl/FileSplitItemsEOServiceImpl.java | 3 ++- 5 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 laws-module-system/src/main/java/com/jero/modules/system/util/CutUtils.java diff --git a/laws-module-system/src/main/java/com/jero/modules/system/util/CutUtils.java b/laws-module-system/src/main/java/com/jero/modules/system/util/CutUtils.java new file mode 100644 index 00000000..3f6a721b --- /dev/null +++ b/laws-module-system/src/main/java/com/jero/modules/system/util/CutUtils.java @@ -0,0 +1,20 @@ +package com.jero.modules.system.util; + +import com.jero.common.constant.enums.LanguageEnum; +import com.jero.common.util.MessageUtils; + +/** + * @ClassName: CutUtils + * @Description: + * @Author: yjz + * @Date: 2024-08-12 10:35 + * @Version: 1.0 + **/ +public class CutUtils { + public static String getCurrentCut() { + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){ + return LanguageEnum.CN.getValue(); + } + return LanguageEnum.EN.getValue(); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index 56a5ad44..c2d37430 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -26,6 +26,7 @@ import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.system.util.CutUtils; import com.jero.modules.system.util.MyStringUtils; import com.jero.modules.system.vo.IdMapBody; import com.jero.modules.system.vo.IdsMapBody; @@ -89,6 +90,7 @@ public class SarFileCompareInfoController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); queryWrapper.and(LambdaQueryWrapper -> LambdaQueryWrapper.eq(SarFileCompareInfo::getCreateBy, sysUser.getUsername()).or().eq(SarFileCompareInfo::getReleaseState, ReleaseConditionEnum.PUBLISHED.getValue())); diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java index 2c208b8e..6106155c 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java @@ -11,6 +11,7 @@ import com.jero.modules.compare.entity.SarFileCompareItemComment; import com.jero.modules.compare.entity.SarFileCompareResultVO; import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.compare.service.ISarFileCompareItemCommentService; +import com.jero.modules.system.util.CutUtils; import com.jero.modules.system.vo.IdMapBody; import com.jero.modules.system.vo.IdsMapBody; import io.swagger.annotations.Api; @@ -198,6 +199,7 @@ public class SarFileCompareItemCommentController extends JeroController importSplitResult(@ApiParam("标准拆分条id") String splitFileId, @ApiParam("国际化") String cut, SarFileSplitInfoEO splitInfoEO) throws IOException { + cut = CutUtils.getCurrentCut(); return fileSplitItemsEOService.importSplitResult(splitFileId, cut,splitInfoEO); } diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 64904e3b..e5b64937 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -61,6 +61,7 @@ import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; +import com.jero.modules.system.util.CutUtils; import com.jero.modules.system.util.MyStringUtils; import com.jero.modules.system.util.UserUtils; import com.jero.modules.tag.entity.LawsTag; @@ -725,7 +726,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl parameter) { - String cut = (String) parameter.get("cut");// 中英文切换标识 + String cut = CutUtils.getCurrentCut();// 中英文切换标识 // 查询条款表所有字段 List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.FILE_SPLIT_ITEMS.getValue()); // 日期类型字段