diff --git a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java index e890c1ba..76614a44 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java +++ b/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()); diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 08feaf61..9a2b60cd 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/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);