From a3a0ce8046ad65ba6f1411c8fedb1c41d636c16e Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 8 Nov 2022 17:26:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=8C=89=E9=92=AE=E3=80=81?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AD=97=E6=AE=B5=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/JobBrowserService.java | 5 ++++- .../entity/extend/po/ExtendInfoPO.java | 4 ++++ .../mapper/extend/ExtendInfoMapper.xml | 4 ++++ .../service/impl/FieldDefinedServiceImpl.java | 22 +++++++++++++++---- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/com/api/browser/service/impl/JobBrowserService.java b/src/com/api/browser/service/impl/JobBrowserService.java index ba85855d..0eea6cbd 100644 --- a/src/com/api/browser/service/impl/JobBrowserService.java +++ b/src/com/api/browser/service/impl/JobBrowserService.java @@ -180,7 +180,10 @@ public class JobBrowserService extends BrowserService { if (detachUtil.isDETACH()) { if (CollectionUtils.isNotEmpty(jclRoleLevelList)) { compList = MapperProxyFactory.getProxy(CompMapper.class).getCompsByIds(jclRoleLevelList); - detachUtil.filterCompanyList(compList); + // 处理上下级关系 + Set collectIds = compList.stream().map(CompPO::getId).collect(Collectors.toSet()); + compList.removeIf(item->collectIds.contains(item.getParentCompany())); + } else { compList = new ArrayList<>(); } diff --git a/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java b/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java index 74d5da3e..d2e62151 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java @@ -111,6 +111,10 @@ public class ExtendInfoPO { private Integer isSystemDefault; + private Integer isModify; + + private Integer checkProps; + private Long creator; private int deleteType; private Date createTime; diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml index cbc8cd91..b396f218 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml @@ -21,6 +21,8 @@ + + @@ -50,6 +52,8 @@ , t.custom_value , t.show_order , t.is_system_default + , t.ismodify + , t.check_props , t.creator , t.delete_type , t.create_time diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index e8393256..d3e80d6b 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -347,9 +347,13 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ recordInfo.put("fieldname", fieldName); recordInfo.put("fieldType", fieldType); recordInfo.put("fieldTypeObj", fieldTypeObj); + // 启用是否勾选 recordInfo.put("enable", Util.null2String(extendInfoPO.getIsenable())); + // 必填是否勾选 recordInfo.put("required", Util.null2String(extendInfoPO.getIsrequired())); - recordInfo.put("isModify", Util.null2String(extendInfoPO.getEditShow())); + // 允许修改是否勾选 + recordInfo.put("isModify", Util.null2String(extendInfoPO.getIsModify())); + // 勾选框是否可选 recordInfo.put("viewAttr", isUsed || isSysField ? 1 : 2); recordInfo.put("key", "" + showOrder); recordInfo.put("fieldidrowKey", fieldIdRowKey); @@ -363,9 +367,19 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ //允许个人修改字段check框属性 Map checkPropsModifyInfo = new HashMap<>(); - checkPropsEnableInfo.put("viewAttr", !isSysField ? 2 : 1); - checkPropsModifyInfo.put("viewAttr", !isSysField ? 2 : 1); - checkPropsRequiredInfo.put("viewAttr", !isSysField ? 2 : 1); + + // 1:只读，2：可编辑, + Integer checkProps = extendInfoPO.getCheckProps(); + if (null == checkProps) { + checkProps = 1; + } + // TODO + // 启用列是否可编辑 + checkPropsEnableInfo.put("viewAttr", checkProps == 3 ? 2 : 1); + // 必填列是否可编辑 + checkPropsRequiredInfo.put("viewAttr", checkProps == 3 ? 2 : 1); + //允许个人修改列是否可编辑 + checkPropsModifyInfo.put("viewAttr", checkProps); checkPropsInfo.put("enable", checkPropsEnableInfo); checkPropsInfo.put("required", checkPropsRequiredInfo);