From 644172662121728089c0f64179af20214601bf7b Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 6 Jun 2022 19:19:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CompServiceImpl.java | 23 ++++++++ .../service/impl/DepartmentServiceImpl.java | 54 +++++++++++-------- .../service/impl/GradeServiceImpl.java | 26 ++++++++- .../service/impl/GroupServiceImpl.java | 14 +++++ .../service/impl/JobServiceImpl.java | 44 ++++++++------- .../service/impl/LevelServiceImpl.java | 26 ++++++++- .../service/impl/PostInfoServiceImpl.java | 25 ++++++++- .../service/impl/PostServiceImpl.java | 19 ++++++- .../service/impl/SchemeServiceImpl.java | 25 ++++++++- .../service/impl/SequenceServiceImpl.java | 26 ++++++++- .../service/impl/StaffPlanServiceImpl.java | 25 ++++++++- .../service/impl/StaffServiceImpl.java | 24 ++++++++- src/com/engine/organization/util/MenuBtn.java | 25 +++++++++ 13 files changed, 308 insertions(+), 48 deletions(-) diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index fe38230d..4a6e6c37 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -33,6 +33,7 @@ import com.engine.organization.util.page.PageUtil; import weaver.crm.Maint.SectorInfoComInfo; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import weaver.hrm.User; import weaver.hrm.resource.ResourceComInfo; @@ -78,6 +79,11 @@ public class CompServiceImpl extends Service implements CompService { @Override public Map listPage(CompSearchParam params) { Map datas = new HashMap<>(); + + datas.put("hasRight", hasRight()); + if (!hasRight()) { + return datas; + } CompPO compPO = CompBO.convertParamToPO(params, (long) user.getUID()); boolean filter = isFilter(compPO); PageInfo pageInfos; @@ -119,6 +125,7 @@ public class CompServiceImpl extends Service implements CompService { @Override public int saveBaseComp(CompSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); // 自动编号 params.setCompNo(CodeRuleUtil.generateCode(RuleCodeType.SUBCOMPANY, params.getCompNo())); List list = getCompMapper().listByNo(Util.null2String(params.getCompNo())); @@ -129,12 +136,14 @@ public class CompServiceImpl extends Service implements CompService { @Override public int updateForbiddenTagById(CompSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); CompPO compPO = CompPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getCompMapper().updateForbiddenTagById(compPO); } @Override public int updateComp(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); CompSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), CompSearchParam.class); String groupId = (String) params.get("viewCondition"); CompPO compPO = CompBO.convertParamToPO(searchParam, (long) user.getUID()); @@ -151,12 +160,14 @@ public class CompServiceImpl extends Service implements CompService { @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getCompMapper().deleteByIds(ids); } @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -199,11 +210,13 @@ public class CompServiceImpl extends Service implements CompService { @Override public Map getHasRight() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getDatasNoBtnColum(); } @Override public Map getCompBaseForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型"); // 2编辑 1查看 int viewAttr = Integer.parseInt((String) params.get("viewAttr")); @@ -239,6 +252,7 @@ public class CompServiceImpl extends Service implements CompService { @Override public Map getCompSaveForm() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -384,5 +398,14 @@ public class CompServiceImpl extends Service implements CompService { return conditionItems; } + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Company:All", user); + } + } diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 0b97537f..e611b919 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -43,6 +43,7 @@ import com.engine.organization.util.tree.SearchTreeUtil; import org.apache.commons.collections4.CollectionUtils; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import weaver.hrm.User; import java.util.*; @@ -92,7 +93,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public PageInfo getDeptListByPid(QuerySingleDeptListParam param) { - + OrganizationAssert.isTrue(hasRight(), "暂无权限"); //1.查询分部下所有部门 //PageUtil.start(param.getCurrent(), param.getPageSize()); List departmentPOS = MapperProxyFactory.getProxy(DepartmentMapper.class).list(); @@ -108,6 +109,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public PageInfo getJobListByPid(QuerySingleDeptListParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listAll(); PageInfo pageInfo = new PageInfo<>(jobPOS); List singleDeptTreeVOS = JobBO.buildSingleJobTreeVOS(jobPOS, param.getParentDept()); @@ -121,6 +123,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getSearchTree(SearchTreeParams params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); String keyword = params.getKeyword(); String id = params.getId(); String type = Util.null2String(params.getType()); @@ -131,6 +134,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map listPage(DeptSearchParam param) { Map datas = new HashMap<>(); + datas.put("hasRight", hasRight()); + if (!hasRight()) { + return datas; + } DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(param, user.getUID()); boolean filter = isFilter(departmentPO); PageInfo pageInfos; @@ -172,6 +179,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int saveBaseForm(DeptSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); // 自动编号 params.setDeptNo(CodeRuleUtil.generateCode(RuleCodeType.DEPARTMENT, params.getDeptNo())); List list = getDepartmentMapper().listByNo(Util.null2String(params.getDeptNo())); @@ -182,12 +190,14 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int updateForbiddenTagById(DeptSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); DepartmentPO departmentPO = DepartmentPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getDepartmentMapper().updateForbiddenTagById(departmentPO); } @Override public int updateForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); DeptSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), DeptSearchParam.class); String groupId = (String) params.get("viewCondition"); DepartmentPO departmentPO = DepartmentBO.convertParamsToPO(searchParam, user.getUID()); @@ -204,12 +214,14 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getDepartmentMapper().deleteByIds(ids); } @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -251,28 +263,13 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getHasRight() { - Map btnDatas = new HashMap<>(); - ArrayList topMenuList = new ArrayList<>(); - ArrayList rightMenuList = new ArrayList<>(); - // 新增 - topMenuList.add(MenuBtn.topMenu_addNew()); - // 批量删除 - topMenuList.add(MenuBtn.topMenu_batchDelete()); - // 复制 - topMenuList.add(MenuBtn.topMenu_copy()); - btnDatas.put("topMenu", topMenuList); - // 新增 - rightMenuList.add(MenuBtn.rightMenu_addNew()); - // 复制 - rightMenuList.add(MenuBtn.rightMenu_copy()); - // 日志 - rightMenuList.add(MenuBtn.rightMenu_btnLog()); - btnDatas.put("rightMenu", rightMenuList); - return btnDatas; + OrganizationAssert.isTrue(hasRight(), "暂无权限"); + return MenuBtn.getDatasHasCopy(); } @Override public Map getDeptBaseForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型"); // 2编辑 1查看 @@ -308,6 +305,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map getSaveForm() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -360,6 +358,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService */ @Override public List getCopyForm() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "复制到", "161", "company", "compBrowser"); @@ -367,7 +366,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService List selectOptions = new ArrayList<>(); SearchConditionOption Option = new SearchConditionOption("1", ""); selectOptions.add(Option); - SearchConditionItem isCheckItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "是否复制岗位信息", "copyJob"); + SearchConditionItem isCheckItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 5, 10, false, "是否复制岗位信息", "copyJob"); isCheckItem.setDetailtype(2); condition.add(compBrowserItem); condition.add(isCheckItem); @@ -383,6 +382,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService */ @Override public int copyDepartment(DeptCopyParam copyParam) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notBlank(copyParam.getCompany(), "请指定需要复制的公司/分部"); int insertCount = 0; List idList = Arrays.stream(copyParam.getIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); @@ -410,6 +410,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public List getMergeForm(Long id) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并到部门", "161", "department", "deptBrowser"); @@ -427,6 +428,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int mergeDepartment(DepartmentMergeParam mergeParam) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); int updateCount = 0; OrganizationAssert.isFalse(mergeParam.getId().equals(mergeParam.getDepartment()), "所选部门与待合并部门一致，无需操作"); OrganizationAssert.notNull(mergeParam.getDepartment(), "请选择需要合并的部门"); @@ -448,6 +450,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public List getMoveForm() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "请选择公司/分部", "161", "company", "compBrowser"); @@ -461,6 +464,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService selectOptions.add(deptOption); SearchConditionItem moveTypeItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "转移到", "moveType"); moveTypeItem.setDetailtype(3); + moveTypeItem.setValue("0"); condition.add(moveTypeItem); condition.add(compBrowserItem); @@ -471,6 +475,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public int moveDepartment(DepartmentMoveParam moveParam) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notBlank(moveParam.getMoveType(), "请选择转移类型"); DepartmentPO deptById = getDepartmentMapper().getDeptById(moveParam.getId()); // 0：公司/分部 1：部门 @@ -648,5 +653,12 @@ public class DepartmentServiceImpl extends Service implements DepartmentService } } - + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Department:All", user); + } } diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index aa172367..21cdc09d 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -53,6 +54,11 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public Map listPage(Map params) { // 刷新引用状态 + Map resultMap = new HashMap<>(); + resultMap.put("hasRight", hasRight()); + if (!hasRight()) { + return resultMap; + } RefreshIsUsedUtil.RefreshGrade("jcl_org_grade"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, GradeTableVO.class); String sqlWhere = buildSqlWhere(params); @@ -60,12 +66,14 @@ public class GradeServiceImpl extends Service implements GradeService { WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); - return result.getResultMap(); + resultMap.putAll(result.getResultMap()); + return resultMap; } @Override public int saveGrade(GradeSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List list = getGradeMapper().listByNo(Util.null2String(param.getGradeNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); GradePO gradePO = GradeDTO.convertParamToPO(param, (long) user.getUID()); @@ -74,18 +82,21 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public int updateGrade(GradeSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); GradePO gradePO = GradeDTO.convertParamToPO(param, (long) user.getUID()); return getGradeMapper().updateGrade(gradePO); } @Override public int updateForbiddenTagById(GradeSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); GradePO gradePO = GradePO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getGradeMapper().updateForbiddenTagById(gradePO); } @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getGradeMapper().deleteByIds(ids); } @@ -93,6 +104,7 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -108,6 +120,7 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public Map getGradeForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -159,11 +172,13 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public Map getHasRight() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getCommonBtnDatas(); } @Override public Map getTabInfo() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build()); @@ -204,4 +219,13 @@ public class GradeServiceImpl extends Service implements GradeService { } return sqlWhere; } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Grade:All", user); + } } diff --git a/src/com/engine/organization/service/impl/GroupServiceImpl.java b/src/com/engine/organization/service/impl/GroupServiceImpl.java index 47bb3e61..e2a51b86 100644 --- a/src/com/engine/organization/service/impl/GroupServiceImpl.java +++ b/src/com/engine/organization/service/impl/GroupServiceImpl.java @@ -11,6 +11,7 @@ import com.engine.organization.util.OrganizationFormItemUtil; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.ArrayList; import java.util.HashMap; @@ -26,6 +27,7 @@ import java.util.Map; public class GroupServiceImpl extends Service implements GroupService { @Override public Map getGroupFormField(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -72,6 +74,7 @@ public class GroupServiceImpl extends Service implements GroupService { @Override public boolean updateGroup(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); String id = Util.null2String(params.get("id")); OrganizationAssert.notNull(id, "数据有误"); String companyname = (String) params.get("companyname"); @@ -84,6 +87,7 @@ public class GroupServiceImpl extends Service implements GroupService { @Override public Map getHasRight() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map btnDatas = new HashMap<>(); ArrayList topMenuList = new ArrayList<>(); ArrayList rightMenuList = new ArrayList<>(); @@ -98,6 +102,7 @@ public class GroupServiceImpl extends Service implements GroupService { @Override public Map getTabInfo() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().title("总部信息").viewCondition("1").build()); @@ -105,4 +110,13 @@ public class GroupServiceImpl extends Service implements GroupService { return apiDatas; } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Group:All", user); + } } diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 16c0d295..8b024799 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -52,6 +52,7 @@ import com.engine.organization.util.tree.SearchTreeUtil; import org.apache.commons.collections4.CollectionUtils; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import weaver.hrm.User; import java.util.*; @@ -126,6 +127,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getSearchTree(SearchTreeParams params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); String keyword = params.getKeyword(); String id = params.getId(); String type = Util.null2String(params.getType()); @@ -136,6 +138,10 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map listPage(JobSearchParam param) { Map datas = new HashMap<>(); + datas.put("hasRight", hasRight()); + if (!hasRight()) { + return datas; + } JobPO jobPO = JobBO.convertParamsToPO(param, user.getUID()); boolean filter = isFilter(jobPO); PageInfo pageInfos; @@ -177,28 +183,13 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getHasRight() { - Map btnDatas = new HashMap<>(); - ArrayList topMenuList = new ArrayList<>(); - ArrayList rightMenuList = new ArrayList<>(); - // 新增 - topMenuList.add(MenuBtn.topMenu_addNew()); - // 批量删除 - topMenuList.add(MenuBtn.topMenu_batchDelete()); - // 复制 - topMenuList.add(MenuBtn.topMenu_copy()); - btnDatas.put("topMenu", topMenuList); - // 新增 - rightMenuList.add(MenuBtn.rightMenu_addNew()); - // 复制 - rightMenuList.add(MenuBtn.rightMenu_copy()); - // 日志 - rightMenuList.add(MenuBtn.rightMenu_btnLog()); - btnDatas.put("rightMenu", rightMenuList); - return btnDatas; + OrganizationAssert.isTrue(hasRight(), "暂无权限"); + return MenuBtn.getDatasHasCopy(); } @Override public Map getSearchCondition() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -260,6 +251,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getSaveForm() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -310,6 +302,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getJobBaseForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型"); // 2编辑 1查看 @@ -365,6 +358,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public int saveBaseForm(JobSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); // 处理自动编号 params.setJobNo(CodeRuleUtil.generateCode(RuleCodeType.JOBTITLES, params.getJobNo())); List list = getJobMapper().listByNo(Util.null2String(params.getJobNo())); @@ -387,6 +381,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public int updateForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); JobSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), JobSearchParam.class); String groupId = (String) params.get("viewCondition"); JobPO jobPO = JobBO.convertParamsToPO(searchParam, user.getUID()); @@ -412,6 +407,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public int copyJobItem(String ids, String department) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notBlank(department, "请指定需要复制的部门"); int insertCount = 0; List idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()); @@ -428,12 +424,14 @@ public class JobServiceImpl extends Service implements JobService { @Override public int updateForbiddenTagById(JobSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); JobPO jobPO = JobPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getJobMapper().updateForbiddenTagById(jobPO.getId(), jobPO.getForbiddenTag()); } @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); Collection deleteIds = new ArrayList<>(); // 递归删除子节点 @@ -443,6 +441,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getHrmListByJobId(Long jobId) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, EmployeeTableVO.class); WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); @@ -686,4 +685,13 @@ public class JobServiceImpl extends Service implements JobService { getChildIds(childIds, deleteIds); } } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Job:All", user); + } } diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index 30593d7d..a122c11f 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -47,6 +48,11 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public Map listPage(Map params) { + Map resultMap = new HashMap<>(); + resultMap.put("hasRight", hasRight()); + if (!hasRight()) { + return resultMap; + } // 刷新引用状态 RefreshIsUsedUtil.RefreshLevel("jcl_org_level"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, LevelTableVO.class); @@ -55,12 +61,14 @@ public class LevelServiceImpl extends Service implements LevelService { WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); - return result.getResultMap(); + resultMap.putAll(result.getResultMap()); + return resultMap; } @Override public int saveLevel(LevelSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List list = getLevelMapper().listByNo(Util.null2String(param.getLevelNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); LevelPO levelPO = LevelDTO.convertParamToPO(param, (long) user.getUID()); @@ -69,18 +77,21 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public int updateLevel(LevelSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); LevelPO levelPO = LevelDTO.convertParamToPO(param, (long) user.getUID()); return getLevelMapper().updateLevel(levelPO); } @Override public int updateForbiddenTagById(LevelSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); LevelPO levelPO = LevelPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getLevelMapper().updateForbiddenTagById(levelPO); } @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getLevelMapper().deleteByIds(ids); } @@ -88,6 +99,7 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -103,6 +115,7 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public Map getLevelForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -145,11 +158,13 @@ public class LevelServiceImpl extends Service implements LevelService { @Override public Map getTableBtn() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getCommonBtnDatas(); } @Override public Map getTabInfo() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build()); @@ -190,4 +205,13 @@ public class LevelServiceImpl extends Service implements LevelService { } return sqlWhere; } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Level:All", user); + } } diff --git a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java index 1c27612e..09ac70af 100644 --- a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java @@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -45,18 +46,25 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map listPage(Map params) { + Map resultMap = new HashMap<>(); + resultMap.put("hasRight", hasRight()); + if (!hasRight()) { + return resultMap; + } OrganizationWeaTable table = new OrganizationWeaTable<>(user, PostInfoTableVO.class); String sqlWhere = buildSqlWhere(params); table.setSqlwhere(sqlWhere); WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); - return result.getResultMap(); + resultMap.putAll(result.getResultMap()); + return resultMap; } @Override public int savePostInfo(PostInfoSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List list = getPostInfoMapper().listByNo(Util.null2String(param.getPostInfoNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); PostInfoPO postInfoPO = PostInfoDTO.convertParamToPO(param, (long) user.getUID()); @@ -65,12 +73,14 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public int updatePostInfo(PostInfoSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); PostInfoPO postInfoPO = PostInfoDTO.convertParamToPO(param, (long) user.getUID()); return getPostInfoMapper().updatePostInfo(postInfoPO); } @Override public int updateForbiddenTagById(PostInfoSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); PostInfoPO postInfoPO = PostInfoPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getPostInfoMapper().updateForbiddenTagById(postInfoPO); } @@ -78,6 +88,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getPostInfoMapper().deleteByIds(ids); } @@ -85,6 +96,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -100,6 +112,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map getPostInfoForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -157,6 +170,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map getHasRight() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getCommonBtnDatas(); } @@ -180,4 +194,13 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { } return sqlWhere; } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("PostInfo:All", user); + } } diff --git a/src/com/engine/organization/service/impl/PostServiceImpl.java b/src/com/engine/organization/service/impl/PostServiceImpl.java index 2f2561e5..ce5e4a34 100644 --- a/src/com/engine/organization/service/impl/PostServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostServiceImpl.java @@ -13,6 +13,7 @@ import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.organization.util.db.MapperProxyFactory; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -30,24 +31,28 @@ public class PostServiceImpl extends Service implements PostService { @Override public int savePost(PostPO postPO) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List list = getPostMapper().listByNo(Util.null2String(postPO.getPostNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); - return getPostMapper().insertIgnoreNull(PostDTO.convertPO(postPO,user.getUID())); + return getPostMapper().insertIgnoreNull(PostDTO.convertPO(postPO, user.getUID())); } @Override public int updatePost(PostPO postPO) { - return getPostMapper().updatePost(PostDTO.convertPO(postPO,user.getUID())); + OrganizationAssert.isTrue(hasRight(), "暂无权限"); + return getPostMapper().updatePost(PostDTO.convertPO(postPO, user.getUID())); } @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getPostMapper().deleteByIds(ids); } @Override public Map getPostForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -79,7 +84,17 @@ public class PostServiceImpl extends Service implements PostService { @Override public TreeData getTreeData() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); ArrayList treeDataList = getPostMapper().getTreeData(); return TreeData.builder().children(treeDataList).title("全部类型").key("-1").build(); } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Post:All", user); + } } diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index 8175fc31..3b675ac1 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -21,6 +21,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -38,6 +39,11 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map listPage(Map params) { + Map resultMap = new HashMap<>(); + resultMap.put("hasRight", hasRight()); + if (!hasRight()) { + return resultMap; + } // 刷新引用状态 RefreshIsUsedUtil.RefreshScheme("jcl_org_scheme"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, SchemeTableVO.class); @@ -46,11 +52,13 @@ public class SchemeServiceImpl extends Service implements SchemeService { WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); - return result.getResultMap(); + resultMap.putAll(result.getResultMap()); + return resultMap; } @Override public Map save(SchemeSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apidatas = new HashMap<>(16); List list = getSchemeMapper().listByNo(Util.null2String(param.getSchemeNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); @@ -61,6 +69,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map updateScheme(SchemeSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apidatas = new HashMap<>(); SchemePO schemePO = SchemeDTO.convertParamToPO(param, (long) user.getUID()); getSchemeMapper().updateScheme(schemePO); @@ -69,6 +78,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public void updateForbiddenTagById(SchemeSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); SchemePO schemePO = SchemePO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); getSchemeMapper().updateForbiddenTagById(schemePO); } @@ -76,6 +86,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public void deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); getSchemeMapper().deleteByIds(ids); } @@ -83,6 +94,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -98,6 +110,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map getSchemeForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -130,6 +143,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map getTableBtn() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getCommonBtnDatas(); } @@ -153,4 +167,13 @@ public class SchemeServiceImpl extends Service implements SchemeService { return sqlWhere; } + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Scheme:All", user); + } + } diff --git a/src/com/engine/organization/service/impl/SequenceServiceImpl.java b/src/com/engine/organization/service/impl/SequenceServiceImpl.java index 92439f4e..779e7f41 100644 --- a/src/com/engine/organization/service/impl/SequenceServiceImpl.java +++ b/src/com/engine/organization/service/impl/SequenceServiceImpl.java @@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -47,6 +48,11 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public Map listPage(Map params) { + Map resultMap = new HashMap<>(); + resultMap.put("hasRight", hasRight()); + if (!hasRight()) { + return resultMap; + } // 刷新引用状态 RefreshIsUsedUtil.RefreshSequence("jcl_org_sequence"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, SequenceTableVO.class); @@ -55,12 +61,14 @@ public class SequenceServiceImpl extends Service implements SequenceService { WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); - return result.getResultMap(); + resultMap.putAll(result.getResultMap()); + return resultMap; } @Override public int saveSequence(SequenceSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List list = getSequenceMapper().listByNo(Util.null2String(param.getSequenceNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); SequencePO sequencePO = SequenceDTO.convertParamToPO(param, (long) user.getUID()); @@ -69,18 +77,21 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public int updateSequence(SequenceSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); SequencePO sequencePO = SequenceDTO.convertParamToPO(param, (long) user.getUID()); return getSequenceMapper().updateSequence(sequencePO); } @Override public int updateForbiddenTagById(SequenceSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); SequencePO sequencePO = SequencePO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getSequenceMapper().updateForbiddenTagById(sequencePO); } @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getSequenceMapper().deleteByIds(ids); } @@ -88,6 +99,7 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -103,6 +115,7 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public Map getSequenceForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -145,11 +158,13 @@ public class SequenceServiceImpl extends Service implements SequenceService { @Override public Map getHasRight() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getCommonBtnDatas(); } @Override public Map getTabInfo() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List topTabs = new ArrayList<>(); topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build()); @@ -190,4 +205,13 @@ public class SequenceServiceImpl extends Service implements SequenceService { } return sqlWhere; } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("Sequence:All", user); + } } diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java index ddd7ab31..324b8fbf 100644 --- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java @@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -46,6 +47,11 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public Map listPage(StaffPlanSearchParam params) { + Map resultMap = new HashMap<>(); + resultMap.put("hasRight", hasRight()); + if (!hasRight()) { + return resultMap; + } // 刷新引用状态 RefreshIsUsedUtil.RefreshStaffPlan("jcl_org_staffplan"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, StaffPlanTableVO.class); @@ -55,11 +61,13 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); - return result.getResultMap(); + resultMap.putAll(result.getResultMap()); + return resultMap; } @Override public int saveStaffPlan(StaffPlanSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); List list = getStaffPlanMapper().listByNo(Util.null2String(param.getPlanNo())); OrganizationAssert.isEmpty(list, "编号不允许重复"); StaffPlanPO staffPlanPO = StaffPlanBO.convertParamToPO(param, (long) user.getUID()); @@ -68,24 +76,28 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public int updateStaffPlan(StaffPlanSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); StaffPlanPO staffPlanPO = StaffPlanBO.convertParamToPO(param, (long) user.getUID()); return getStaffPlanMapper().updateStaffPlan(staffPlanPO); } @Override public int updateForbiddenTagById(StaffPlanSearchParam params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); StaffPlanPO staffPlanPO = StaffPlanPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); return getStaffPlanMapper().updateForbiddenTagById(staffPlanPO); } @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getStaffPlanMapper().deleteByIds(ids); } @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -128,6 +140,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public Map getForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -189,6 +202,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { @Override public Map getHasRight() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getCommonBtnDatas(); } @@ -237,4 +251,13 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { } return sqlWhere; } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("StaffPlan:All", user); + } } diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 6704fb45..193d7244 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; +import weaver.hrm.HrmUserVarify; import java.util.*; @@ -61,6 +62,11 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public Map listPage(StaffSearchParam params) { + Map resultMap = new HashMap<>(); + resultMap.put("hasRight", hasRight()); + if (!hasRight()) { + return resultMap; + } // 刷新引用状态 RefreshIsUsedUtil.RefreshStaff("jcl_org_staff"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, StaffTableVO.class); @@ -70,17 +76,20 @@ public class StaffServiceImpl extends Service implements StaffService { WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); - return result.getResultMap(); + resultMap.putAll(result.getResultMap()); + return resultMap; } @Override public int saveStaff(StaffSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); StaffPO staffPO = StaffBO.convertParamToPO(param, (long) user.getUID()); return getStaffMapper().insertIgnoreNull(staffPO); } @Override public int updateStaff(StaffSearchParam param) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); StaffPO staffPlanPO = StaffBO.convertParamToPO(param, (long) user.getUID()); return getStaffMapper().updateStaff(staffPlanPO); } @@ -88,12 +97,14 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public int deleteByIds(Collection ids) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); OrganizationAssert.notEmpty(ids, "请选择要删除的数据"); return getStaffMapper().deleteByIds(ids); } @Override public Map getSearchCondition(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List addGroups = new ArrayList<>(); List conditionItems = new ArrayList<>(); @@ -144,6 +155,7 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public Map getForm(Map params) { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); @@ -217,6 +229,7 @@ public class StaffServiceImpl extends Service implements StaffService { @Override public Map getHasRight() { + OrganizationAssert.isTrue(hasRight(), "暂无权限"); return MenuBtn.getCommonBtnDatas(); } @@ -277,4 +290,13 @@ public class StaffServiceImpl extends Service implements StaffService { return sqlWhere; } + + /** + * 是否有该模块权限 + * + * @return + */ + private boolean hasRight() { + return HrmUserVarify.checkUserRight("StaffPlan:All", user); + } } diff --git a/src/com/engine/organization/util/MenuBtn.java b/src/com/engine/organization/util/MenuBtn.java index 7d00f83d..b95ad66d 100644 --- a/src/com/engine/organization/util/MenuBtn.java +++ b/src/com/engine/organization/util/MenuBtn.java @@ -136,5 +136,30 @@ public class MenuBtn { return btnDatas; } + /** + * 获取常用按钮列表 + * @return + */ + public static Map getDatasHasCopy() { + Map btnDatas = new HashMap<>(); + ArrayList topMenuList = new ArrayList<>(); + ArrayList rightMenuList = new ArrayList<>(); + // 新增 + topMenuList.add(MenuBtn.topMenu_addNew()); + // 批量删除 + topMenuList.add(MenuBtn.topMenu_batchDelete()); + // 复制 + topMenuList.add(MenuBtn.topMenu_copy()); + btnDatas.put("topMenu", topMenuList); + // 新增 + rightMenuList.add(MenuBtn.rightMenu_addNew()); + // 复制 + rightMenuList.add(MenuBtn.rightMenu_copy()); + // 日志 + rightMenuList.add(MenuBtn.rightMenu_btnLog()); + btnDatas.put("rightMenu", rightMenuList); + return btnDatas; + } + }