人事卡片BUG修复

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<FormItem> formItemList = new ArrayList<>();
         for (ExtendGroupPO groupPO : extendGroupList) {
             FormItem formItem = getFormItem(groupPO, uId);
+            if (CollectionUtils.isEmpty(formItem.getItems())) {
+                continue;
+            }
             formItemList.add(formItem);
         }
         // 所有锚点
         List<Anchor> anchorList = new ArrayList<>();
         // 添加字段分组信息
-        for (ExtendGroupPO extendGroupPO : extendGroupList) {
+        for (FormItem formItem : formItemList) {
-            anchorList.add(Anchor.builder().id("group" + extendGroupPO.getId()).title(extendGroupPO.getGroupName()).build());
+            anchorList.add(Anchor.builder().id(formItem.getId()).title(formItem.getTitle()).build());
         }
         // 添加拓展页面信息
         List<ResourceBaseTab> 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<ExtendInfoPO> 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<String, Object> 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));