Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf

src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java

@@ -37,7 +37,7 @@ public class ExtendGroupBO {
                         .isShow(e.getIsShow())
                         .key(e.getId())
                         .name(e.getGroupName())
-                        .viewAttr(e.getId() <= 0 ? 1 : 2)
+                        .viewAttr(e.getIsSystemDefault() == 0 ? 1 : 2)
                         .pid(e.getPid())
                         .build()).collect(Collectors.toList());
 

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

@@ -76,7 +76,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
             tab.put("tabkey", idx++);
             tab.put("title", extendTitle.getTitle());
             tab.put("isShow", extendTitle.getIsShow());
-            tab.put("groupid", extendTitle.getId());
+            tab.put("groupid", String.valueOf(extendTitle.getId()));
             tab.put("viewAttr", extendTitle.getIsSystemDefault() == 0 ? 1 : 2);
             tab.put("editable", getExtendInfoMapper().countFieldsByGroupId(tableName, extendTitle.getId()) == 0);
             tabs.add(tab);