diff --git a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java index eb220ed3..f7d15e19 100644 --- a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java +++ b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java @@ -33,7 +33,7 @@ import lombok.NoArgsConstructor; " left join HRMJOBTITLES t3 on t.JOBTITLE=t3.id" + " left join HRMJOBACTIVITIES t4 on t3.JOBACTIVITYID=t4.ID" + " left join HRMJOBGROUPS t5 on t4.JOBGROUPID=t5.ID ", - orderby = " t.dsporder ", + orderby = " t.dsporder", sortway = " asc", primarykey = "id", operates = { diff --git a/src/com/engine/organization/service/impl/CardAccessServiceImpl.java b/src/com/engine/organization/service/impl/CardAccessServiceImpl.java index 5c9559ab..db48ea10 100644 --- a/src/com/engine/organization/service/impl/CardAccessServiceImpl.java +++ b/src/com/engine/organization/service/impl/CardAccessServiceImpl.java @@ -60,8 +60,9 @@ public class CardAccessServiceImpl extends Service implements CardAccessService @Override public Map hasRight() { Map resultMap = new HashMap<>(); - boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); - resultMap.put("hasRight", hasRight); + //boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); + //脚本未找到该菜单 放开所有 + resultMap.put("hasRight", true); return resultMap; } diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index a4df3778..a06bf172 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -66,6 +66,7 @@ import weaver.general.Util; import weaver.hrm.company.DepartmentComInfo; import weaver.hrm.company.SubCompanyComInfo; import weaver.hrm.definedfield.HrmFieldManager; +import weaver.hrm.privacy.PrivacyComInfo; import weaver.systeminfo.SystemEnv; import java.math.BigDecimal; @@ -188,25 +189,40 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic } List items = filterByDomkey(all, columnList); + List privacyList = Arrays.asList("-1_hrm_mobile","-1_hrm_telephone","-1_hrm_mobilecall","-1_hrm_fax","-1_hrm_email"); for (SearchConditionItem item : items) { String columnName = item.getDomkey()[0]; WeaTableColumn weaTableColumn = new WeaTableColumn(); if (columnName.equals("-1_cus_"+propValue)){ + weaTableColumn.setOtherpara(columnName); fields.add("t.id as " + buildTableSql(columnName).replace(".", "_")); weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getOrgValue"); + }else if(privacyList.contains(columnName)) { + fields.add(buildTableSql(columnName) + " as " + buildTableSql(columnName).replace(".", "_")); + PrivacyComInfo pc = new PrivacyComInfo(); + Map mapShowSets = pc.getMapShowSets(); + String[] parts = columnName.split("_"); + String fieldName = parts[parts.length - 1]; + if (mapShowSets != null && mapShowSets.get("mobile") != null) { + weaTableColumn.setOtherpara("column:id+" + user.getUID() + "+"+fieldName+""); + weaTableColumn.setTransmethod("weaver.hrm.privacy.PrivacyComInfo.getSearchContent"); + }else { + weaTableColumn.setOtherpara(fieldName+":"+user.getLanguage()); + weaTableColumn.setTransmethod("weaver.hrm.HrmTransMethod.getDefineContent"); + } - }else{ + } else{ + weaTableColumn.setOtherpara(columnName); fields.add(buildTableSql(columnName) + " as " + buildTableSql(columnName).replace(".", "_")); weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue"); } - String scopeId = columnName.split("_")[0]; String fieldName = columnName.substring(columnName.lastIndexOf("_") + 1); weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId, user.getLanguage())); weaTableColumn.setColumn(buildTableSql(columnName).replace(".", "_")); - weaTableColumn.setOtherpara(columnName); + weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE); weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%"); weaTableColumnList.add(weaTableColumn); @@ -217,6 +233,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic weaTableColumn.setColumn("id"); weaTableColumn.setDisplay(WeaBoolAttr.FALSE); + weaTableColumnList.add(weaTableColumn); fields.add("t.id"); table.setBackfields(StringUtils.join(fields, ","));