liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
dxfeng 2022-06-20 13:56:26 +08:00
parent 96ba954aa1 30d44f029b
commit 1c971bf1ae
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java
View File

@ -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());

2
src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
View File

@ -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);