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

岗位按钮、人员字段权限

This commit is contained in:
dxfeng 2022-11-08 17:26:59 +08:00
parent 22fa6a60c7
commit a3a0ce8046
4 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/api/browser/service/impl/JobBrowserService.java
View File

@ -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<Long> collectIds = compList.stream().map(CompPO::getId).collect(Collectors.toSet());
compList.removeIf(item->collectIds.contains(item.getParentCompany()));
} else {
compList = new ArrayList<>();
}

4
src/com/engine/organization/entity/extend/po/ExtendInfoPO.java
View File

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

4
src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml
View File

@ -21,6 +21,8 @@
<result column="custom_value" property="customValue"/>
<result column="show_order" property="showOrder"/>
<result column="is_system_default" property="isSystemDefault"/>
<result column="ismodify" property="isModify"/>
<result column="check_props" property="checkProps"/>
<result column="creator" property="creator"/>
<result column="delete_type" property="deleteType"/>
<result column="create_time" property="createTime"/>
@ -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

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

@ -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<String, Object> 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);