Merge pull request '人员卡片，明细表展示' (#61) from feature/dxf into develop

Reviewed-on: #61

src/com/engine/organization/entity/personnelcard/FormItem.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author:dxfeng
@@ -20,4 +21,6 @@ public class FormItem {
     private String id;
     private String title;
     private List<Item> items;
+
+    private List<Map<String, Object>> details;
 }

src/com/engine/organization/service/impl/ExtServiceImpl.java

@@ -198,7 +198,7 @@ public class ExtServiceImpl extends Service implements ExtService {
                 for (String key : keys) {
                     resultMap.put(key.toLowerCase(), item.get(key));
                 }
-                resultMap.put("viewAttr", finalCheckRight ? 2 : 1);
+                resultMap.put("viewAttr", finalCheckRight ? viewAttr : 1);
                 return resultMap;
             }).collect(Collectors.toList());
             tabinfoMap.put("datas", collect);

src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java

@@ -2,6 +2,7 @@ package com.engine.organization.service.impl;
 
 import com.engine.common.service.HrmCommonService;
 import com.engine.common.service.impl.HrmCommonServiceImpl;
+import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.organization.entity.extend.ExtendInfoOperateType;
 import com.engine.organization.entity.extend.bo.ExtendGroupBO;
@@ -106,7 +107,12 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel
             if (CollectionUtils.isEmpty(formItem.getItems())) {
                 continue;
             }
+            // 处理明细表数据
+            List<Map<String, Object>> detailList = ServiceUtil.getService(ExtServiceImpl.class, user).getExtendTables(user, "4", groupPO.getId(), "JCL_ORG_HRMRESOURCEEXT_DT1", uId, 1, false);
+            formItem.setDetails(detailList);
+
             formItemList.add(formItem);
+
         }
         // 所有锚点
         List<Anchor> anchorList = new ArrayList<>();
@@ -236,7 +242,7 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel
         }
 
         // 系统管理员、查看本人卡片,或者所有人有权限直接返回true
-        if (user.isAdmin() || userId.equals(String.valueOf(user.getUID()))||1 == cardAccessPO.getAllPeople()) {
+        if (user.isAdmin() || userId.equals(String.valueOf(user.getUID())) || 1 == cardAccessPO.getAllPeople()) {
             return true;
         }