From ae81492f5c4646b8d2ce7b543774e883a7bf6942 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 6 Nov 2023 17:21:03 +0800 Subject: [PATCH] fix: 78217 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 企业标准-编辑 添加授权部门，没有存上 --- .../common/service/impl/LawsCommonServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 1d102b48..90bb9031 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 @@ -20,7 +20,9 @@ import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.common.util.ImportUtil; import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspectContent; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; @@ -133,6 +135,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { private ILawsOverseasStandardService lawsOverseasStandardService; @Autowired private ILawsEnterpriseStandardService lawsEnterpriseStandardService; + @Resource + private EnterpriseStandardAuthDeptService enterpriseAuthDeptService; /** * @Author: liao @@ -1076,6 +1080,14 @@ public class LawsCommonServiceImpl implements ILawsCommonService { esIcWrapper.eq(EnterpriseStandardInspectContent::getStandardId, id); List list = esInspectContentService.list(esIcWrapper); stringObjectMap.put("checkList", list); + // 企标独有的授权部门 + LambdaQueryWrapper authDeptWrapper = new LambdaQueryWrapper<>(); + authDeptWrapper.eq(EnterpriseStandardAuthDept::getStandardId, id); + List authDeptList = enterpriseAuthDeptService.list(authDeptWrapper); + // 将authDeptList的所有auth_dept取出来转换成逗号拼接的字符串 + String authDept = authDeptList.stream().map(EnterpriseStandardAuthDept::getAuthDept) + .collect(Collectors.joining(",")); + stringObjectMap.put(FieldCommon.AUTH_DEPT, authDept); } // 标准拆分标识