From 7adce6c119f816b326f36f8865f42e5d9cb8fc68 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 10 Apr 2024 17:35:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E7=AB=8B=E9=A1=B9?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B=E6=B2=A1=E6=9C=89=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=B5=81=E7=A8=8B=E6=97=A0=E6=B3=95=E5=8F=91=E8=B5=B7?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 18 +++++++++++++++++- .../util/EnterpriseStandardUtil.java | 4 ++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index cc787fe0..a8954bcd 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -15,6 +15,7 @@ import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; +import com.jero.common.system.vo.SysDepartTreeModel; import com.jero.common.util.IntekeyUtils; import com.jero.common.util.MessageUtils; import com.jero.common.util.MinioUtil; @@ -58,6 +59,7 @@ import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.util.SysWaterMarkUtil; +import com.jero.modules.system.util.UserUtils; import com.jero.modules.tag.entity.LawsArea; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.FieldShowTypeEnum; @@ -171,6 +173,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService { @Resource private IProcessFbStandardConsultationService processFbStandardConsultationService; + @Resource + private ISysDepartService departService; + public static boolean ENCRYPT_ENABLE; public static String DECRYPT_URL; public static String DECRYPT_APP_CODE; @@ -731,7 +736,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { this.esInspectContentSaveOrUpdate(inspectContents, id, standardNumber); } // 企标授权部门处理 - if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(module)) { + if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(module) || + TableNameEnum.FOREIGN_REGULATIONS.getValue().equals(module)) { if (parameterMap.get(FieldCommon.AUTH_DEPT) != null) { esAuthUserService.resetAuthDept(id, parameterMap.get(FieldCommon.AUTH_DEPT).toString()); } @@ -2100,6 +2106,16 @@ public class LawsCommonServiceImpl implements ILawsCommonService { parameterMap.remove(FieldCommon.AUTH_DEPT); } } + if (module.equals(TableNameEnum.FOREIGN_REGULATIONS.getValue())) { + // 外标判断当前登陆人是不是汽车研究总院及子部门的员工，如果是则可以查看引进标准，不做任何操作 + // 如果不是则需要将引进标准的id从所有id中排除掉 + // 获取汽车研发总院及其所有子部门 + List departList = departService.queryTreeByKeyWord("汽车研究总院"); + List departIdList = departList.stream().map(SysDepartTreeModel::getId).collect(Collectors.toList()); + String userId = UserUtils.getUserId(); +// sysUserService.getUserByDepIds() + + } // 体系 String standardSystem = (String) parameterMap.get(FieldCommon.STANDARD_SYSTEM); if (StrUtil.isNotBlank(standardSystem)) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java index 651c291b..74158b8a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java @@ -306,9 +306,9 @@ public class EnterpriseStandardUtil { processInstanceIdList = paList.stream().map(ProcessAll::getProcessInstanceId).collect(Collectors.toList()); } LambdaQueryWrapper initChangeWrapper = new LambdaQueryWrapper<>(); - initChangeWrapper.in(ProcessEsInitChange::getNewEnStandardNo, standardNumbers); initChangeWrapper.eq(ProcessEsInitChange::getDelFlag, YesOrNoEnum.NO.getValue()); - initChangeWrapper.in(ProcessEsInitChange::getProcessInstanceId, processInstanceIdList); + initChangeWrapper.in(!standardNumbers.isEmpty(), ProcessEsInitChange::getNewEnStandardNo, standardNumbers); + initChangeWrapper.in(!processInstanceIdList.isEmpty(), ProcessEsInitChange::getProcessInstanceId, processInstanceIdList); numList.addAll(initChangeService.list(initChangeWrapper) .stream().map(ProcessEsInitChange::getNewEnStandardNo).collect(Collectors.toList())); List duplicateStandardNumbers = new ArrayList<>();