From 95744654b7eb74c9c9f809e10523a9f84bf2a007 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Mon, 20 Jun 2022 09:48:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()); From 0ddecb1d2fe159bc7b907101644e597744ddfce6 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Mon, 20 Jun 2022 11:12:37 +0800 Subject: [PATCH 2/2] v1.2 --- .../organization/service/impl/FieldDefinedServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);