From 414aefe41c2d1d1ada1f6535a007f1607561f5ac Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 18 Oct 2022 11:41:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E4=BA=8B=E5=8D=A1=E7=89=87BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HrmPersonnelCardServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java b/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java index f4492ede..8809d07e 100644 --- a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java @@ -20,11 +20,13 @@ import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.field.FieldDefinedValueUtil; import com.engine.portal.biz.constants.ModuleConstants; import com.engine.portal.biz.nonstandardfunction.SysModuleInfoBiz; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import weaver.blog.BlogShareManager; import weaver.cowork.CoworkShareManager; import weaver.crm.CrmShareBase; import weaver.docs.search.DocSearchComInfo; +import weaver.general.BaseBean; import weaver.general.Util; import weaver.workflow.search.WorkflowRequestUtil; @@ -87,13 +89,16 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel List formItemList = new ArrayList<>(); for (ExtendGroupPO groupPO : extendGroupList) { FormItem formItem = getFormItem(groupPO, uId); + if (CollectionUtils.isEmpty(formItem.getItems())) { + continue; + } formItemList.add(formItem); } // 所有锚点 List anchorList = new ArrayList<>(); // 添加字段分组信息 - for (ExtendGroupPO extendGroupPO : extendGroupList) { - anchorList.add(Anchor.builder().id("group" + extendGroupPO.getId()).title(extendGroupPO.getGroupName()).build()); + for (FormItem formItem : formItemList) { + anchorList.add(Anchor.builder().id(formItem.getId()).title(formItem.getTitle()).build()); } // 添加拓展页面信息 List resourceBaseTabList = getPersonnelCardMapper().getResourceBaseTabList(); @@ -162,6 +167,7 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel } return statistical; } catch (Exception e) { + new BaseBean().writeLog(e); throw new RuntimeException(e); } } @@ -175,13 +181,13 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel for (ExtendTitlePO extendTitlePO : extendTitleList) { List extendInfoList = getExtendInfoMapper().listFields(extendGroup.getExtendType().toString(), extendTitlePO.getId().toString(), ExtendGroupBO.getTableNameByGroupPO(extendGroup), ExtendInfoOperateType.LIST.getValue(), IS_SHOW); String fields = extendInfoList.stream().map(ExtendInfoPO::getFieldName).collect(Collectors.joining(",")); - if(StringUtils.isBlank(fields)){ + if (StringUtils.isBlank(fields)) { continue; } ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName(ExtendGroupBO.getTableNameByGroupPO(extendGroup)).fields(fields).params(null).id(uId).build(); Map fieldValueMap = getExtMapper().listExt(infoParams); for (ExtendInfoPO extendInfoPO : extendInfoList) { - String fieldShowName =""; + String fieldShowName = ""; if (null != fieldValueMap) { Object fieldValue = fieldValueMap.get(extendInfoPO.getFieldName()); fieldShowName = FieldDefinedValueUtil.getFieldValue(user, extendInfoPO, Util.null2String(fieldValue));