From 3acec4730d99fb87e494e5eb388093abf97599b3 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 17 Aug 2022 19:29:46 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=EF=BC=8C=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/extend/bo/ExtendGroupBO.java | 8 ++- .../entity/postion/vo/PostInfoTableVO.java | 10 ++-- .../mapper/post/PostInfoMapper.java | 7 +++ .../mapper/post/PostInfoMapper.xml | 10 +++- .../service/ImportCommonService.java | 2 + .../organization/service/OrgChartService.java | 2 + .../service/impl/FieldDefinedServiceImpl.java | 30 ++++++++-- .../service/impl/ImportCommonServiceImpl.java | 21 +++++-- .../service/impl/OrgChartServiceImpl.java | 10 ++++ .../service/impl/PostInfoServiceImpl.java | 7 +-- .../service/impl/StaffServiceImpl.java | 1 + .../organization/util/RefreshIsUsedUtil.java | 12 ++++ .../hrmimport/HrmImportProcessE9.java | 9 +-- .../web/ImportCommonController.java | 14 ++++- .../organization/web/OrgChartController.java | 60 ++++++++++++------- .../wrapper/ImportCommonWrapper.java | 6 +- .../organization/wrapper/OrgChartWrapper.java | 4 ++ 17 files changed, 159 insertions(+), 54 deletions(-) diff --git a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java index a746d1cc..f890cf96 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java @@ -83,7 +83,9 @@ public class ExtendGroupBO { } if (extendGroupPO.getIsSystemDefault() == 0) { - + if (null != extendGroupPO.getPid()) { + tableName += "EXT_DT1"; + } } else if (null == extendGroupPO.getPid()) { tableName += "EXT"; } else { @@ -94,9 +96,9 @@ public class ExtendGroupBO { private static boolean isSelect(Long id) { - if (id == 1 || id == 2 || id == 3 || id ==4) { + if (id == 1 || id == 2 || id == 3 || id == 4) { return true; - }else { + } else { return false; } } diff --git a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java index c89837c7..7db50123 100644 --- a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java +++ b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java @@ -1,8 +1,7 @@ package com.engine.organization.entity.postion.vo; -import com.engine.organization.annotation.OrganizationTable; -import com.engine.organization.annotation.OrganizationTableColumn; -import com.engine.organization.annotation.OrganizationTableOperate; +import com.cloudstore.eccom.pc.table.WeaTableType; +import com.engine.organization.annotation.*; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -27,6 +26,7 @@ import lombok.NoArgsConstructor; " t.post_info_qualification," + " a.post_name," + " t.description," + + "t.is_used," + " t.forbidden_tag", fromSql = " from jcl_org_post_info t inner join jcl_org_post a on t.post_id = a.id ", orderby = "post_info_no", @@ -35,7 +35,9 @@ import lombok.NoArgsConstructor; operates = { @OrganizationTableOperate(index = "0", text = "编辑"), @OrganizationTableOperate(index = "1", text = "删除") - } + }, tableType = WeaTableType.CHECKBOX, + operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatSourceOperates", otherpara = "column:is_used"), + checkboxPopedom = @CheckboxPopedom(showmethod = "com.engine.organization.util.ConfigTrans.getCheckBoxPopedom", popedompara = "column:is_used") ) public class PostInfoTableVO { /** diff --git a/src/com/engine/organization/mapper/post/PostInfoMapper.java b/src/com/engine/organization/mapper/post/PostInfoMapper.java index 10a55536..e6f72d0e 100644 --- a/src/com/engine/organization/mapper/post/PostInfoMapper.java +++ b/src/com/engine/organization/mapper/post/PostInfoMapper.java @@ -77,4 +77,11 @@ public interface PostInfoMapper { List getPostInfosByIds(@Param("ids") Collection ids); + + /** + * 查询所有被引用的ID + * + * @return + */ + List listUsedId(); } diff --git a/src/com/engine/organization/mapper/post/PostInfoMapper.xml b/src/com/engine/organization/mapper/post/PostInfoMapper.xml index bb105e60..54e4551c 100644 --- a/src/com/engine/organization/mapper/post/PostInfoMapper.xml +++ b/src/com/engine/organization/mapper/post/PostInfoMapper.xml @@ -74,6 +74,11 @@ #{id} + update jcl_org_post_info @@ -168,8 +173,9 @@ - - + + select JCL_ORG_POST_INFO_ID.currval from dual INSERT INTO jcl_org_post_info diff --git a/src/com/engine/organization/service/ImportCommonService.java b/src/com/engine/organization/service/ImportCommonService.java index a5545e26..67278570 100644 --- a/src/com/engine/organization/service/ImportCommonService.java +++ b/src/com/engine/organization/service/ImportCommonService.java @@ -41,4 +41,6 @@ public interface ImportCommonService { */ Map getImportResult(Map params); + Map getHasRight(); + } diff --git a/src/com/engine/organization/service/OrgChartService.java b/src/com/engine/organization/service/OrgChartService.java index 30039cbb..10070794 100644 --- a/src/com/engine/organization/service/OrgChartService.java +++ b/src/com/engine/organization/service/OrgChartService.java @@ -20,4 +20,6 @@ public interface OrgChartService { Map asyncUserData(Map request2Map, User user); Map asyncCompanyData(Map request2Map, User user); + + Map getHasRight(); } diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 229309f6..e1e55dd4 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -23,6 +23,7 @@ import com.engine.organization.mapper.extend.ExtendGroupMapper; import com.engine.organization.mapper.extend.ExtendInfoMapper; import com.engine.organization.mapper.extend.ExtendTitleMapper; import com.engine.organization.service.FieldDefinedService; +import com.engine.organization.util.HasRightUtil; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections.CollectionUtils; @@ -229,6 +230,28 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ @Override public Map getFieldDefinedInfo(ExtendFieldSearchParam param) { Map returnMap = new HashMap<>(); + Long groupType = param.getGroupType(); + ExtendGroupPO extendGroupPO = getExtendGroupMapper().getGroupById(groupType); + String rightName = ""; + switch (extendGroupPO.getExtendType()) { + case 1: + rightName = "CompanyField:All"; + break; + case 2: + rightName = "DepartmentField:All"; + break; + case 3: + rightName = "PostField:All"; + break; + default: + break; + } + boolean hasRight = HasRightUtil.hasRight(user, rightName, true); + returnMap.put("hasRight", hasRight); + if (!hasRight) { + return returnMap; + } + List> lsFieldInfo = new ArrayList<>(); Map fieldInfo; Map recordInfo; @@ -238,10 +261,9 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ List lsComDetialInfo; Map comDetialInfo; // 区分主表明细表 - Long groupType = param.getGroupType(); - ExtendGroupPO extendGroupPO = getExtendGroupMapper().getGroupById(groupType); + String tableName = ExtendGroupBO.getTableNameByGroupPO(extendGroupPO); - List infoPOList = getExtendInfoMapper().listFields("", param.getGroupId().toString(), tableName, "",""); + List infoPOList = getExtendInfoMapper().listFields("", param.getGroupId().toString(), tableName, "", ""); for (ExtendInfoPO extendInfoPO : infoPOList) { Long fieldId = extendInfoPO.getId(); String fieldName = extendInfoPO.getFieldName(); @@ -436,7 +458,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ //明细表删除字段信息、删除表结构 ExtendGroupPO extendGroupPO = getExtendGroupMapper().getGroupById(id); MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id); - List extendInfoList = getExtendInfoMapper().listFields(extendGroupPO.getExtendType().toString(), extendGroupPO.getId().toString(), ExtendGroupBO.getTableNameByGroupPO(extendGroupPO), "",""); + List extendInfoList = getExtendInfoMapper().listFields(extendGroupPO.getExtendType().toString(), extendGroupPO.getId().toString(), ExtendGroupBO.getTableNameByGroupPO(extendGroupPO), "", ""); List ids = extendInfoList.stream().map(ExtendInfoPO::getId).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(ids)) { // 删除数据 diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java index b1694c47..60e662ab 100644 --- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java @@ -30,6 +30,7 @@ import com.engine.organization.mapper.jclimport.JclImportHistoryMapper; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.service.ImportCommonService; import com.engine.organization.thread.OrganizationRunable; +import com.engine.organization.util.HasRightUtil; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.excel.ExcelUtil; @@ -73,6 +74,8 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ private static final Long DEPARTMENT_TYPE = 2L; private static final Long JOB_TYPE = 3L; + private static final String RIGHT_NAME = "DataImport:All"; + private ExtendInfoMapper getExtendInfoMapper() { return MapperProxyFactory.getProxy(ExtendInfoMapper.class); @@ -212,6 +215,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ returnMap.put("pId", jobImport(operateType, excelFile)); break; case "resource": + Long importHistoryId = saveImportLog("resource", operateType); List lsErrorInfo = new ArrayList<>(); HrmImportAdaptExcelE9 importAdapt = new HrmImportAdaptExcelE9(); FileUploadToPath fu = new FileUploadToPath(request); @@ -223,9 +227,8 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ Map hrMap = importAdapt.getHrmImportMap(); HrmImportProcessE9 importProcess = new HrmImportProcessE9(); - Map map = importProcess.init(request); - int pId = Util.getIntValue(Util.null2String(map.get("pId"))); - returnMap.put("pId", pId); + importProcess.init(request, importHistoryId); + importProcess.processMap(hrMap); } else { @@ -234,8 +237,10 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ error = new HashMap<>(); error.put("message", Util.null2String(errorInfo.get(i))); lsErrorInfo.add(error); + MapperProxyFactory.getProxy(JclImportHistoryDetailMapper.class).insertHistoryDetail(JclImportHistoryDetailPO.builder().pid(importHistoryId).operateDetail(Util.null2String(errorInfo.get(i))).status("0").build()); } } + returnMap.put("pId", importHistoryId); break; default: break; @@ -264,6 +269,14 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ return resultMap; } + @Override + public Map getHasRight() { + Map returnMap = new HashMap<>(); + boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); + returnMap.put("hasRight", hasRight); + return returnMap; + } + /** * 分部导入表单 @@ -1083,8 +1096,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ } - - /** * 读取表格文本内容 */ diff --git a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java index 78d1cb58..3f7c9837 100644 --- a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; import com.engine.core.impl.Service; import com.engine.organization.service.OrgChartService; +import com.engine.organization.util.HasRightUtil; import com.engine.organization.util.db.DBType; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; @@ -20,6 +21,7 @@ import java.util.*; public class OrgChartServiceImpl extends Service implements OrgChartService { private RecordSet grs = new RecordSet(); + private static final String RIGHT_NAME = "OrgChart:All"; @Override public Map getOptionCondition(Map request2Map, User user) { @@ -321,6 +323,14 @@ public class OrgChartServiceImpl extends Service implements OrgChartService { return result; } + @Override + public Map getHasRight() { + Map returnMap = new HashMap<>(); + boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true); + returnMap.put("hasRight", hasRight); + return returnMap; + } + private void findUserItemByParantId(String id, int currentLevel, String level, RecordSet rs, List> list, String whereSql, boolean expand) { rs.executeQuery("select t.id, t.fname, t.ftype, t.fparentid, t.fleadername, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber from jcl_org_map t " + whereSql + " and t.fparentid = " + id); List> currentList = new ArrayList<>(); diff --git a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java index 227a34e9..26dc96f0 100644 --- a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java @@ -14,10 +14,7 @@ import com.engine.organization.entity.postion.vo.PostInfoTableVO; import com.engine.organization.mapper.post.PostInfoMapper; import com.engine.organization.mapper.post.PostMapper; import com.engine.organization.service.PostInfoService; -import com.engine.organization.util.HasRightUtil; -import com.engine.organization.util.MenuBtn; -import com.engine.organization.util.OrganizationAssert; -import com.engine.organization.util.OrganizationFormItemUtil; +import com.engine.organization.util.*; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.lang3.StringUtils; @@ -53,6 +50,8 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { if (!hasRight) { return resultMap; } + // 刷新引用状态 + RefreshIsUsedUtil.RefreshPostInfo("jcl_org_post_info"); OrganizationWeaTable table = new OrganizationWeaTable<>(user, PostInfoTableVO.class); String sqlWhere = buildSqlWhere(params); table.setSqlwhere(sqlWhere); diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index b798a96d..2b53021f 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -88,6 +88,7 @@ public class StaffServiceImpl extends Service implements StaffService { public int saveStaff(StaffSearchParam param) { HasRightUtil.hasRight(user, RIGHT_NAME, false); StaffPO staffPO = StaffBO.convertParamToPO(param, (long) user.getUID()); + OrganizationAssert.isFalse(staffPO.getStaffNum() < 0, "编制数不可小于0，请更正"); checkRequired(staffPO); return getStaffMapper().insertIgnoreNull(staffPO); } diff --git a/src/com/engine/organization/util/RefreshIsUsedUtil.java b/src/com/engine/organization/util/RefreshIsUsedUtil.java index 5f256ebd..74bfdc56 100644 --- a/src/com/engine/organization/util/RefreshIsUsedUtil.java +++ b/src/com/engine/organization/util/RefreshIsUsedUtil.java @@ -1,6 +1,7 @@ package com.engine.organization.util; import com.engine.organization.mapper.common.RefreshUseMapper; +import com.engine.organization.mapper.post.PostInfoMapper; import com.engine.organization.mapper.scheme.GradeMapper; import com.engine.organization.mapper.scheme.LevelMapper; import com.engine.organization.mapper.scheme.SchemeMapper; @@ -95,6 +96,17 @@ public class RefreshIsUsedUtil { } + /** + * 刷新职务信息 + *

+ * JCL_ORG_JOBEXT_DT1 + */ + public static void RefreshPostInfo(String tableName) { + List usedIds = MapperProxyFactory.getProxy(PostInfoMapper.class).listUsedId(); + usedIds.removeIf(Objects::isNull); + RefreshIsUsedStatus(tableName, usedIds); + } + /** * 更新指定表的引用状态 * diff --git a/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java b/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java index 49f157e1..c8f6dbd4 100644 --- a/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java +++ b/src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java @@ -11,7 +11,6 @@ import com.engine.hrm.util.face.HrmFaceCheckManager; import com.engine.hrm.util.face.ValidateFieldManager; import com.engine.hrm.util.face.bean.CheckItemBean; import com.engine.organization.entity.jclimport.po.JclImportHistoryDetailPO; -import com.engine.organization.entity.jclimport.po.JclImportHistoryPO; import com.engine.organization.mapper.jclimport.JclImportHistoryDetailMapper; import com.engine.organization.mapper.jclimport.JclImportHistoryMapper; import com.engine.organization.trigger.cusfielddata.CusFieldDataTrigger; @@ -21,7 +20,6 @@ import com.weaver.integration.ldap.util.AuthenticUtil; import ln.LN; import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; -import weaver.common.DateUtil; import weaver.common.StringUtil; import weaver.conn.RecordSet; import weaver.conn.RecordSetTrans; @@ -118,7 +116,7 @@ public class HrmImportProcessE9 extends BaseBean { this.user = user; } - public Map init(HttpServletRequest request) { + public Map init(HttpServletRequest request, Long importHistoryId) { Map retmap = new HashMap<>(); try { this.user = (User) request.getSession(true).getAttribute("weaver_user@bean"); @@ -127,10 +125,7 @@ public class HrmImportProcessE9 extends BaseBean { Map params = ParamUtil.request2Map(request); params.put("operateType", this.operateType); - JclImportHistoryPO historyPO = JclImportHistoryPO.builder().operator((long) user.getUID()).operateTime(DateUtil.getFullDate()).clientAddress(user.getLoginip()).importType("resource").sourceFrom("excel").operateType(operateType).status("importing").build(); - MapperProxyFactory.getProxy(JclImportHistoryMapper.class).insertHistory(historyPO); - retmap.put("pId", historyPO.getId()); - this.pId = Util.getIntValue(Util.null2String(retmap.get("pId"))); + this.pId = importHistoryId.intValue(); LN license = new LN(); diff --git a/src/com/engine/organization/web/ImportCommonController.java b/src/com/engine/organization/web/ImportCommonController.java index 08b0b10f..987c8480 100644 --- a/src/com/engine/organization/web/ImportCommonController.java +++ b/src/com/engine/organization/web/ImportCommonController.java @@ -66,7 +66,7 @@ public class ImportCommonController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getImportCommonWrapper(user).saveImport(map,request)); + return ReturnResult.successed(getImportCommonWrapper(user).saveImport(map, request)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -85,4 +85,16 @@ public class ImportCommonController { return ReturnResult.exceptionHandle(e); } } + + @GET + @Path("/getHasRight") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getImportCommonWrapper(user).getHasRight()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } } diff --git a/src/com/engine/organization/web/OrgChartController.java b/src/com/engine/organization/web/OrgChartController.java index 92dcbaac..62585f2c 100644 --- a/src/com/engine/organization/web/OrgChartController.java +++ b/src/com/engine/organization/web/OrgChartController.java @@ -3,6 +3,7 @@ package com.engine.organization.web; import com.alibaba.fastjson.JSONObject; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; +import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.OrgChartWrapper; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; @@ -30,18 +31,18 @@ public class OrgChartController { /** * 获取组织维度信息 - * */ + */ @GET @Path("/getCondition") @Produces(MediaType.APPLICATION_JSON) public String getCondition(@Context HttpServletRequest request, @Context HttpServletResponse - response){ - Map apidatas = new HashMap(); - try{ + response) { + Map apidatas = new HashMap(); + try { User user = HrmUserVarify.getUser(request, response); //实例化Service 并调用业务类处理 apidatas = getOrgChartWrapper(user).getOptionCondition(ParamUtil.request2Map(request), user); - }catch(Exception e){ + } catch (Exception e) { //异常处理 e.printStackTrace(); apidatas.put("api_status", false); @@ -53,18 +54,18 @@ public class OrgChartController { /** * 组织架构数据 - * */ + */ @GET @Path("/companyData") @Produces(MediaType.APPLICATION_JSON) public String getCompanyData(@Context HttpServletRequest request, @Context HttpServletResponse - response){ - Map apidatas = new HashMap(); - try{ + response) { + Map apidatas = new HashMap(); + try { User user = HrmUserVarify.getUser(request, response); //实例化Service 并调用业务类处理 apidatas = getOrgChartWrapper(user).getCompanyData(ParamUtil.request2Map(request), user); - }catch(Exception e){ + } catch (Exception e) { //异常处理 e.printStackTrace(); apidatas.put("api_status", false); @@ -76,18 +77,18 @@ public class OrgChartController { /** * 组织透视图 - * */ + */ @GET @Path("/userData") @Produces(MediaType.APPLICATION_JSON) public String getUserData(@Context HttpServletRequest request, @Context HttpServletResponse - response){ - Map apidatas = new HashMap(); - try{ + response) { + Map apidatas = new HashMap(); + try { User user = HrmUserVarify.getUser(request, response); //实例化Service 并调用业务类处理 apidatas = getOrgChartWrapper(user).getUserData(ParamUtil.request2Map(request), user); - }catch(Exception e){ + } catch (Exception e) { //异常处理 e.printStackTrace(); apidatas.put("api_status", false); @@ -104,13 +105,13 @@ public class OrgChartController { @Path("/asyncUserData") @Produces(MediaType.APPLICATION_JSON) public String asyncUserData(@Context HttpServletRequest request, @Context HttpServletResponse - response){ - Map apidatas = new HashMap(); - try{ + response) { + Map apidatas = new HashMap(); + try { User user = HrmUserVarify.getUser(request, response); //实例化Service 并调用业务类处理 apidatas = getOrgChartWrapper(user).asyncUserData(ParamUtil.request2Map(request), user); - }catch(Exception e){ + } catch (Exception e) { //异常处理 e.printStackTrace(); apidatas.put("api_status", false); @@ -127,13 +128,13 @@ public class OrgChartController { @Path("/asyncCompanyData") @Produces(MediaType.APPLICATION_JSON) public String asyncCompanyData(@Context HttpServletRequest request, @Context HttpServletResponse - response){ - Map apidatas = new HashMap(); - try{ + response) { + Map apidatas = new HashMap(); + try { User user = HrmUserVarify.getUser(request, response); //实例化Service 并调用业务类处理 apidatas = getOrgChartWrapper(user).asyncCompanyData(ParamUtil.request2Map(request), user); - }catch(Exception e){ + } catch (Exception e) { //异常处理 e.printStackTrace(); apidatas.put("api_status", false); @@ -143,4 +144,17 @@ public class OrgChartController { return JSONObject.toJSONString(apidatas); } + @GET + @Path("/getHasRight") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { + // TODO 权限控制调整 + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getOrgChartWrapper(user).getHasRight()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } + } diff --git a/src/com/engine/organization/wrapper/ImportCommonWrapper.java b/src/com/engine/organization/wrapper/ImportCommonWrapper.java index 3ad9d49d..8233a3de 100644 --- a/src/com/engine/organization/wrapper/ImportCommonWrapper.java +++ b/src/com/engine/organization/wrapper/ImportCommonWrapper.java @@ -49,7 +49,7 @@ public class ImportCommonWrapper extends Service { * @return */ public Map saveImport(Map params, HttpServletRequest request) { - return getImportCommonService(user).saveImport(params,request); + return getImportCommonService(user).saveImport(params, request); } /** @@ -61,4 +61,8 @@ public class ImportCommonWrapper extends Service { public Map getImportResult(Map params) { return getImportCommonService(user).getImportResult(params); } + + public Map getHasRight() { + return getImportCommonService(user).getHasRight(); + } } diff --git a/src/com/engine/organization/wrapper/OrgChartWrapper.java b/src/com/engine/organization/wrapper/OrgChartWrapper.java index 33c672a0..33b1dc31 100644 --- a/src/com/engine/organization/wrapper/OrgChartWrapper.java +++ b/src/com/engine/organization/wrapper/OrgChartWrapper.java @@ -39,4 +39,8 @@ public class OrgChartWrapper extends Service { public Map asyncCompanyData(Map request2Map, User user) { return getOrgChartService(user).asyncCompanyData(request2Map, user); } + + public Map getHasRight(){ + return getOrgChartService(user).getHasRight(); + } }