diff --git a/src/com/engine/organization/service/impl/CodeSettingServiceImpl.java b/src/com/engine/organization/service/impl/CodeSettingServiceImpl.java index a55965fa..c402a385 100644 --- a/src/com/engine/organization/service/impl/CodeSettingServiceImpl.java +++ b/src/com/engine/organization/service/impl/CodeSettingServiceImpl.java @@ -55,7 +55,7 @@ public class CodeSettingServiceImpl extends Service implements CodeSettingServic break; } retmap.put("hasRight", hasRight); - return ReturnResult.successed(retmap); + return ReturnResult.successed(user,retmap); } @Override diff --git a/src/com/engine/organization/util/response/ReturnResult.java b/src/com/engine/organization/util/response/ReturnResult.java index d5fedfbe..2f5562c0 100644 --- a/src/com/engine/organization/util/response/ReturnResult.java +++ b/src/com/engine/organization/util/response/ReturnResult.java @@ -103,8 +103,8 @@ public class ReturnResult implements Serializable { /** * 返回默认状态 */ - public static ReturnResult successed() { - return new ReturnResult<>(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage()); + public static ReturnResult successed(User user) { + return new ReturnResult<>(ResultCode.SUCCESS.getCode(), SystemEnv.getHtmlLabelName(ResultCode.SUCCESS.getLabelId(), user.getLanguage())); } /** @@ -113,11 +113,11 @@ public class ReturnResult implements Serializable { * @param data * @return */ - @Deprecated - public static ReturnResult successed(T data) { - - return new ReturnResult<>(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), data); - } + //@Deprecated + //public static ReturnResult successed(T data) { + // + // return new ReturnResult<>(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), data); + //} /** * 多语言响应 diff --git a/src/com/engine/organization/web/CardAccessController.java b/src/com/engine/organization/web/CardAccessController.java index 2ea30535..87a68472 100644 --- a/src/com/engine/organization/web/CardAccessController.java +++ b/src/com/engine/organization/web/CardAccessController.java @@ -37,7 +37,7 @@ public class CardAccessController { public ReturnResult hasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getCardAccessWrapper(user).hasRight()); + return ReturnResult.successed(user,getCardAccessWrapper(user).hasRight()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -49,7 +49,7 @@ public class CardAccessController { public ReturnResult listPage(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getCardAccessWrapper(user).listPage()); + return ReturnResult.successed(user,getCardAccessWrapper(user).listPage()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -62,7 +62,7 @@ public class CardAccessController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getCardAccessWrapper(user).save(map)); + return ReturnResult.successed(user,getCardAccessWrapper(user).save(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -74,7 +74,7 @@ public class CardAccessController { public ReturnResult getCardButtonTable(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getCardAccessWrapper(user).getCardButtonTable()); + return ReturnResult.successed(user,getCardAccessWrapper(user).getCardButtonTable()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -87,7 +87,7 @@ public class CardAccessController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getCardAccessWrapper(user).saveCardButton(map)); + return ReturnResult.successed(user,getCardAccessWrapper(user).saveCardButton(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/CompController.java b/src/com/engine/organization/web/CompController.java index 6ee763de..be679b73 100644 --- a/src/com/engine/organization/web/CompController.java +++ b/src/com/engine/organization/web/CompController.java @@ -46,7 +46,7 @@ public class CompController { public ReturnResult listComp(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody CompParam params) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getCompWrapper(user).listPage(params)); + return ReturnResult.successed(user,getCompWrapper(user).listPage(params)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -66,7 +66,7 @@ public class CompController { public ReturnResult saveBaseComp(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getCompWrapper(user).saveBaseComp(ParamUtil.request2Map(request))); + return ReturnResult.successed(user,getCompWrapper(user).saveBaseComp(ParamUtil.request2Map(request))); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -86,7 +86,7 @@ public class CompController { public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody CompParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getCompWrapper(user).updateForbiddenTagById(param)); + return ReturnResult.successed(user,getCompWrapper(user).updateForbiddenTagById(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -106,7 +106,7 @@ public class CompController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getCompWrapper(user).updateComp(map)); + return ReturnResult.successed(user,getCompWrapper(user).updateComp(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -126,7 +126,7 @@ public class CompController { public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getCompWrapper(user).deleteByIds(param.getIds())); + return ReturnResult.successed(user,getCompWrapper(user).deleteByIds(param.getIds())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -145,7 +145,7 @@ public class CompController { public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getCompWrapper(user).getSearchCondition()); + return ReturnResult.successed(user,getCompWrapper(user).getSearchCondition()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -164,7 +164,7 @@ public class CompController { public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getCompWrapper(user).getHasRight()); + return ReturnResult.successed(user,getCompWrapper(user).getHasRight()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -184,7 +184,7 @@ public class CompController { try { User user = HrmUserVarify.getUser(request, response); Map params = ParamUtil.request2Map(request); - return ReturnResult.successed(getCompWrapper(user).getCompBaseForm(params)); + return ReturnResult.successed(user,getCompWrapper(user).getCompBaseForm(params)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -205,7 +205,7 @@ public class CompController { try { User user = HrmUserVarify.getUser(request, response); Map params = ParamUtil.request2Map(request); - return ReturnResult.successed(getCompWrapper(user).getCompSaveForm(params)); + return ReturnResult.successed(user,getCompWrapper(user).getCompSaveForm(params)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -217,7 +217,7 @@ public class CompController { public ReturnResult getMoveForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getCompWrapper(user).getMoveForm()); + return ReturnResult.successed(user,getCompWrapper(user).getMoveForm()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -229,7 +229,7 @@ public class CompController { public ReturnResult moveCompany(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DepartmentMoveParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getCompWrapper(user).moveCompany(param)); + return ReturnResult.successed(user,getCompWrapper(user).moveCompany(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/ConfigController.java b/src/com/engine/organization/web/ConfigController.java index b9a60a90..88ad09d7 100644 --- a/src/com/engine/organization/web/ConfigController.java +++ b/src/com/engine/organization/web/ConfigController.java @@ -1,7 +1,6 @@ package com.engine.organization.web; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.config.dto.EditTableDatas; import com.engine.organization.entity.config.params.QTXConfigParam; import com.engine.organization.entity.config.po.QTXConfigPO; import com.engine.organization.service.ConfigService; @@ -55,7 +54,7 @@ public class ConfigController { public ReturnResult selectConfigInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getConfigService(user).selectConfigInfo()); + return ReturnResult.successed(user,getConfigService(user).selectConfigInfo()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -72,7 +71,7 @@ public class ConfigController { String isopenconfig = request.getParameter("isopenconfig"); ObjectMapper objectMapper = new ObjectMapper(); QTXConfigPO qtxConfigPO = objectMapper.readValue(editTable, QTXConfigPO.class); - return ReturnResult.successed(getConfigService(user).saveConfigInfo(qtxConfigPO,isopenconfig)); + return ReturnResult.successed(user,getConfigService(user).saveConfigInfo(qtxConfigPO,isopenconfig)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/DepartmentController.java b/src/com/engine/organization/web/DepartmentController.java index 3e2dad8c..993c3342 100644 --- a/src/com/engine/organization/web/DepartmentController.java +++ b/src/com/engine/organization/web/DepartmentController.java @@ -56,7 +56,7 @@ public class DepartmentController { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); String parentDept = (String) map.get("parentDept"); - return ReturnResult.successed(getDepartmentWrapper(user).getJobListByPid(QuerySingleDeptListParam.builder().parentDept(Integer.parseInt(parentDept)).build())); + return ReturnResult.successed(user,getDepartmentWrapper(user).getJobListByPid(QuerySingleDeptListParam.builder().parentDept(Integer.parseInt(parentDept)).build())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -94,7 +94,7 @@ public class DepartmentController { public ReturnResult listDept(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeptSearchParam params) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getDepartmentWrapper(user).listPage(params)); + return ReturnResult.successed(user,getDepartmentWrapper(user).listPage(params)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -114,7 +114,7 @@ public class DepartmentController { try { User user = HrmUserVarify.getUser(request, response); Map params = ParamUtil.request2Map(request); - return ReturnResult.successed(getDepartmentWrapper(user).saveBaseForm(params)); + return ReturnResult.successed(user,getDepartmentWrapper(user).saveBaseForm(params)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -134,7 +134,7 @@ public class DepartmentController { public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeptSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getDepartmentWrapper(user).updateForbiddenTagById(param)); + return ReturnResult.successed(user,getDepartmentWrapper(user).updateForbiddenTagById(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -154,7 +154,7 @@ public class DepartmentController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getDepartmentWrapper(user).updateForm(map)); + return ReturnResult.successed(user,getDepartmentWrapper(user).updateForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -175,7 +175,7 @@ public class DepartmentController { public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getDepartmentWrapper(user).deleteByIds(param.getIds())); + return ReturnResult.successed(user,getDepartmentWrapper(user).deleteByIds(param.getIds())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -195,7 +195,7 @@ public class DepartmentController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getDepartmentWrapper(user).getSearchCondition(map)); + return ReturnResult.successed(user,getDepartmentWrapper(user).getSearchCondition(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -214,7 +214,7 @@ public class DepartmentController { public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getDepartmentWrapper(user).getHasRight()); + return ReturnResult.successed(user,getDepartmentWrapper(user).getHasRight()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -234,7 +234,7 @@ public class DepartmentController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getDepartmentWrapper(user).getDeptBaseForm(map)); + return ReturnResult.successed(user,getDepartmentWrapper(user).getDeptBaseForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -254,7 +254,7 @@ public class DepartmentController { try { User user = HrmUserVarify.getUser(request, response); Map params = ParamUtil.request2Map(request); - return ReturnResult.successed(getDepartmentWrapper(user).getSaveForm(params)); + return ReturnResult.successed(user,getDepartmentWrapper(user).getSaveForm(params)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -267,7 +267,7 @@ public class DepartmentController { public ReturnResult getCopyForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getDepartmentWrapper(user).getCopyForm()); + return ReturnResult.successed(user,getDepartmentWrapper(user).getCopyForm()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -279,7 +279,7 @@ public class DepartmentController { public ReturnResult copyDepartment(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeptCopyParam copyParam) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getDepartmentWrapper(user).copyDepartment(copyParam)); + return ReturnResult.successed(user,getDepartmentWrapper(user).copyDepartment(copyParam)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -291,7 +291,7 @@ public class DepartmentController { public ReturnResult getMergeForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getDepartmentWrapper(user).getMergeForm()); + return ReturnResult.successed(user,getDepartmentWrapper(user).getMergeForm()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -303,7 +303,7 @@ public class DepartmentController { public ReturnResult mergeDepartment(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DepartmentMergeParam mergeParam) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getDepartmentWrapper(user).mergeDepartment(mergeParam)); + return ReturnResult.successed(user,getDepartmentWrapper(user).mergeDepartment(mergeParam)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -315,7 +315,7 @@ public class DepartmentController { public ReturnResult getMoveForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getDepartmentWrapper(user).getMoveForm()); + return ReturnResult.successed(user,getDepartmentWrapper(user).getMoveForm()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -327,7 +327,7 @@ public class DepartmentController { public ReturnResult moveDepartment(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DepartmentMoveParam moveParam) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getDepartmentWrapper(user).moveDepartment(moveParam)); + return ReturnResult.successed(user,getDepartmentWrapper(user).moveDepartment(moveParam)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -339,7 +339,7 @@ public class DepartmentController { try { User user = HrmUserVarify.getUser(request, response); Map params = ParamUtil.request2Map(request); - return ReturnResult.successed(getDepartmentWrapper(user).dragDepartment(departmentDragParam)); + return ReturnResult.successed(user,getDepartmentWrapper(user).dragDepartment(departmentDragParam)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index 0e3e9d67..6b0f591c 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -93,7 +93,7 @@ public class FieldDefinedController { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); String groupType = (String) map.get("groupType"); - return ReturnResult.successed(getFieldDefinedWrapper(user).getTabInfo(groupType)); + return ReturnResult.successed(user,getFieldDefinedWrapper(user).getTabInfo(groupType)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -113,7 +113,7 @@ public class FieldDefinedController { public ReturnResult saveGroup(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getFieldDefinedWrapper(user).saveGroup(param)); + return ReturnResult.successed(user,getFieldDefinedWrapper(user).saveGroup(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -133,7 +133,7 @@ public class FieldDefinedController { public ReturnResult saveTitle(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getFieldDefinedWrapper(user).saveTitle(param)); + return ReturnResult.successed(user,getFieldDefinedWrapper(user).saveTitle(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -145,7 +145,7 @@ public class FieldDefinedController { public ReturnResult deleteTitle(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(param)); + return ReturnResult.successed(user,getFieldDefinedWrapper(user).deleteTitle(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -157,7 +157,7 @@ public class FieldDefinedController { public ReturnResult saveFields(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getFieldDefinedWrapper(user).saveFields(param.getData())); + return ReturnResult.successed(user,getFieldDefinedWrapper(user).saveFields(param.getData())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -172,7 +172,7 @@ public class FieldDefinedController { Map map = ParamUtil.request2Map(request); Long groupType = Long.parseLong((String) map.get("groupType")); Long groupId = Long.parseLong((String) map.get("groupId")); - return ReturnResult.successed(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build())); + return ReturnResult.successed(user,getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -185,7 +185,7 @@ public class FieldDefinedController { try { User user = HrmUserVarify.getUser(request, response); getFieldDefinedWrapper(user).deleteFieldDefined(param); - return ReturnResult.successed(); + return ReturnResult.successed(user); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -198,7 +198,7 @@ public class FieldDefinedController { try { User user = HrmUserVarify.getUser(request, response); getFieldDefinedWrapper(user).changeGroup(param); - return ReturnResult.successed(); + return ReturnResult.successed(user); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -210,7 +210,7 @@ public class FieldDefinedController { public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getFieldDefinedWrapper(user).getHasRight(moduleTypeEnum)); + return ReturnResult.successed(user,getFieldDefinedWrapper(user).getHasRight(moduleTypeEnum)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/GradeController.java b/src/com/engine/organization/web/GradeController.java index 47cd7191..0ef084e9 100644 --- a/src/com/engine/organization/web/GradeController.java +++ b/src/com/engine/organization/web/GradeController.java @@ -44,7 +44,7 @@ public class GradeController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getGradeWrapper(user).listPage(map)); + return ReturnResult.successed(user,getGradeWrapper(user).listPage(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -63,7 +63,7 @@ public class GradeController { public ReturnResult saveGrade(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody GradeSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getGradeWrapper(user).saveGrade(param)); + return ReturnResult.successed(user,getGradeWrapper(user).saveGrade(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -83,7 +83,7 @@ public class GradeController { public ReturnResult updateGrade(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody GradeSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getGradeWrapper(user).updateGrade(param)); + return ReturnResult.successed(user,getGradeWrapper(user).updateGrade(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -103,7 +103,7 @@ public class GradeController { public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody GradeSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getGradeWrapper(user).updateForbiddenTagById(param)); + return ReturnResult.successed(user,getGradeWrapper(user).updateForbiddenTagById(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -124,7 +124,7 @@ public class GradeController { public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getGradeWrapper(user).deleteByIds(param.getIds())); + return ReturnResult.successed(user,getGradeWrapper(user).deleteByIds(param.getIds())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -144,7 +144,7 @@ public class GradeController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getGradeWrapper(user).getSearchCondition(map)); + return ReturnResult.successed(user,getGradeWrapper(user).getSearchCondition(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -166,7 +166,7 @@ public class GradeController { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); //String s = Util.null2String(map.get(ParamConstant.PARAM_IP)); - return ReturnResult.successed(getGradeWrapper(user).getGradeForm(map)); + return ReturnResult.successed(user,getGradeWrapper(user).getGradeForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -185,7 +185,7 @@ public class GradeController { public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getGradeWrapper(user).getHasRight()); + return ReturnResult.successed(user,getGradeWrapper(user).getHasRight()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -197,7 +197,7 @@ public class GradeController { public ReturnResult getTabInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getGradeWrapper(user).getTabInfo()); + return ReturnResult.successed(user,getGradeWrapper(user).getTabInfo()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -210,7 +210,7 @@ public class GradeController { @QueryParam("id")Long id) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getGradeWrapper(user).getLevelId(id)); + return ReturnResult.successed(user,getGradeWrapper(user).getLevelId(id)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/GroupController.java b/src/com/engine/organization/web/GroupController.java index d8ce86fc..50b7cd42 100644 --- a/src/com/engine/organization/web/GroupController.java +++ b/src/com/engine/organization/web/GroupController.java @@ -43,7 +43,7 @@ public class GroupController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getGroupWrapper(user).getGroupFormField(map)); + return ReturnResult.successed(user,getGroupWrapper(user).getGroupFormField(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -55,7 +55,7 @@ public class GroupController { public ReturnResult updateGroup(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Map map) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getGroupWrapper(user).updateGroup(map)); + return ReturnResult.successed(user,getGroupWrapper(user).updateGroup(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -74,7 +74,7 @@ public class GroupController { public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getGroupWrapper(user).getHasRight()); + return ReturnResult.successed(user,getGroupWrapper(user).getHasRight()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -86,7 +86,7 @@ public class GroupController { public ReturnResult getTabInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getGroupWrapper(user).getTabInfo()); + return ReturnResult.successed(user,getGroupWrapper(user).getTabInfo()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/HrmResourceController.java b/src/com/engine/organization/web/HrmResourceController.java index 9862e3e4..621e3c53 100644 --- a/src/com/engine/organization/web/HrmResourceController.java +++ b/src/com/engine/organization/web/HrmResourceController.java @@ -67,7 +67,7 @@ public class HrmResourceController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getHrmResourceWrapper(user).listPage(map)); + return ReturnResult.successed(user,getHrmResourceWrapper(user).listPage(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -86,7 +86,7 @@ public class HrmResourceController { public ReturnResult getSaveForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getHrmResourceWrapper(user).getSaveForm()); + return ReturnResult.successed(user,getHrmResourceWrapper(user).getSaveForm()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -105,7 +105,7 @@ public class HrmResourceController { public ReturnResult saveBaseForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Map params) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getHrmResourceWrapper(user).saveBaseForm(params)); + return ReturnResult.successed(user,getHrmResourceWrapper(user).saveBaseForm(params)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -125,7 +125,7 @@ public class HrmResourceController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getHrmResourceWrapper(user).getBaseForm(map)); + return ReturnResult.successed(user,getHrmResourceWrapper(user).getBaseForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -145,7 +145,7 @@ public class HrmResourceController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getHrmResourceWrapper(user).updateForm(map)); + return ReturnResult.successed(user,getHrmResourceWrapper(user).updateForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -165,7 +165,7 @@ public class HrmResourceController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(JSON.toJSON(getHrmResourceWrapper(user).getSearchCondition(map))); + return ReturnResult.successed(user,JSON.toJSON(getHrmResourceWrapper(user).getSearchCondition(map))); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -179,7 +179,7 @@ public class HrmResourceController { try { User user = HrmUserVarify.getUser(request, response); Integer templateId = getHrmResourceWrapper(user).saveSearchTemplate(params); - return ReturnResult.successed(Util.null2String(templateId)); + return ReturnResult.successed(user,Util.null2String(templateId)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -192,7 +192,7 @@ public class HrmResourceController { try { User user = HrmUserVarify.getUser(request, response); getHrmResourceWrapper(user).deleteSearchTemplate(params.getId()); - return ReturnResult.successed(); + return ReturnResult.successed(user); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -205,7 +205,7 @@ public class HrmResourceController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(JSON.toJSON(getHrmResourceWrapper(user).getTemplateSelectKeys(map))); + return ReturnResult.successed(user,JSON.toJSON(getHrmResourceWrapper(user).getTemplateSelectKeys(map))); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -218,7 +218,7 @@ public class HrmResourceController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(JSON.toJSON(getHrmResourceWrapper(user).getSearchTemplate(map))); + return ReturnResult.successed(user,JSON.toJSON(getHrmResourceWrapper(user).getSearchTemplate(map))); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -237,7 +237,7 @@ public class HrmResourceController { public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getHrmResourceWrapper(user).getHasRight()); + return ReturnResult.successed(user,getHrmResourceWrapper(user).getHasRight()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -250,7 +250,7 @@ public class HrmResourceController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getHrmResourceWrapper(user).getTabForm(map)); + return ReturnResult.successed(user,getHrmResourceWrapper(user).getTabForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -262,7 +262,7 @@ public class HrmResourceController { public ReturnResult saveTabForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody HrmRelationSaveParam params) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getHrmResourceWrapper(user).saveTabForm(params)); + return ReturnResult.successed(user,getHrmResourceWrapper(user).saveTabForm(params)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -274,7 +274,7 @@ public class HrmResourceController { public ReturnResult updateTabForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody HrmRelationSaveParam params) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getHrmResourceWrapper(user).updateTabForm(params)); + return ReturnResult.successed(user,getHrmResourceWrapper(user).updateTabForm(params)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -287,7 +287,7 @@ public class HrmResourceController { try { User user = HrmUserVarify.getUser(request, response); Integer templateId = getHrmResourceWrapper(user).saveCustomTemplate(params); - return ReturnResult.successed(Util.null2String(templateId)); + return ReturnResult.successed(user,Util.null2String(templateId)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -300,7 +300,7 @@ public class HrmResourceController { try { User user = HrmUserVarify.getUser(request, response); getHrmResourceWrapper(user).deleteCustomTemplate(params.getId()); - return ReturnResult.successed(); + return ReturnResult.successed(user); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -313,7 +313,7 @@ public class HrmResourceController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(JSON.toJSON(getHrmResourceWrapper(user).getCustomTransferData(map))); + return ReturnResult.successed(user,JSON.toJSON(getHrmResourceWrapper(user).getCustomTransferData(map))); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -332,7 +332,7 @@ public class HrmResourceController { try { User user = HrmUserVarify.getUser(request, response); Map params = ParamUtil.request2Map(request); - return ReturnResult.successed(getHrmResourceWrapper(user).getCustomTemplate(params)); + return ReturnResult.successed(user,getHrmResourceWrapper(user).getCustomTemplate(params)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -352,7 +352,7 @@ public class HrmResourceController { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); Integer templateId = getHrmResourceWrapper(user).updateCustomTemplate(map); - return ReturnResult.successed(Util.null2String(templateId)); + return ReturnResult.successed(user,Util.null2String(templateId)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -368,7 +368,7 @@ public class HrmResourceController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getHrmResourceWrapper(user).saveColumnsCustomTemplate(map)); + return ReturnResult.successed(user,getHrmResourceWrapper(user).saveColumnsCustomTemplate(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/ImportCommonController.java b/src/com/engine/organization/web/ImportCommonController.java index 60b89d99..9a64e435 100644 --- a/src/com/engine/organization/web/ImportCommonController.java +++ b/src/com/engine/organization/web/ImportCommonController.java @@ -38,7 +38,7 @@ public class ImportCommonController { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); String importType = (String) map.get("importType"); - return ReturnResult.successed(getImportCommonWrapper(user).getImportFields(importType)); + return ReturnResult.successed(user,getImportCommonWrapper(user).getImportFields(importType)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -54,7 +54,7 @@ public class ImportCommonController { Map map = ParamUtil.request2Map(request); String importType = (String) map.get("importType"); String columns = (String) map.get("columns"); - return ReturnResult.successed(getImportCommonWrapper(user).getImportForm(importType, columns)); + return ReturnResult.successed(user,getImportCommonWrapper(user).getImportForm(importType, columns)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -67,7 +67,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(user,getImportCommonWrapper(user).saveImport(map, request)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -81,7 +81,7 @@ public class ImportCommonController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getImportCommonWrapper(user).getImportResult(map)); + return ReturnResult.successed(user,getImportCommonWrapper(user).getImportResult(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -93,7 +93,7 @@ public class ImportCommonController { public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getImportCommonWrapper(user).getHasRight()); + return ReturnResult.successed(user,getImportCommonWrapper(user).getHasRight()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -106,7 +106,7 @@ public class ImportCommonController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getImportCommonWrapper(user).saveCommonImport(map)); + return ReturnResult.successed(user,getImportCommonWrapper(user).saveCommonImport(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -119,7 +119,7 @@ public class ImportCommonController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getImportCommonWrapper(user).getCommonForm(Util.null2String(map.get("importModule")))); + return ReturnResult.successed(user,getImportCommonWrapper(user).getCommonForm(Util.null2String(map.get("importModule")))); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/JclOrgController.java b/src/com/engine/organization/web/JclOrgController.java index ff89c56f..9138bc90 100644 --- a/src/com/engine/organization/web/JclOrgController.java +++ b/src/com/engine/organization/web/JclOrgController.java @@ -37,7 +37,7 @@ public class JclOrgController { Map map = ParamUtil.request2Map(request); String id = Util.null2String(map.get("id")); String type = Util.null2String(map.get("type")); - return ReturnResult.successed(getJclOrgWrapper(user).getJclOrgId(id, type)); + return ReturnResult.successed(user,getJclOrgWrapper(user).getJclOrgId(id, type)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -52,7 +52,7 @@ public class JclOrgController { Map map = ParamUtil.request2Map(request); String id = Util.null2String(map.get("id")); String type = Util.null2String(map.get("type")); - return ReturnResult.successed(getJclOrgWrapper(user).getEcOrgId(id, type)); + return ReturnResult.successed(user,getJclOrgWrapper(user).getEcOrgId(id, type)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -67,7 +67,7 @@ public class JclOrgController { Map map = ParamUtil.request2Map(request); String id = Util.null2String(map.get("id")); getJclOrgWrapper(user).syncCusFieldData(id); - return ReturnResult.successed(); + return ReturnResult.successed(user); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -82,7 +82,7 @@ public class JclOrgController { Map map = ParamUtil.request2Map(request); String id = Util.null2String(map.get("id")); getJclOrgWrapper(user).supplementResourceInfo(Integer.parseInt(id)); - return ReturnResult.successed(); + return ReturnResult.successed(user); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/JobController.java b/src/com/engine/organization/web/JobController.java index 5235a96f..bdd54fed 100644 --- a/src/com/engine/organization/web/JobController.java +++ b/src/com/engine/organization/web/JobController.java @@ -66,7 +66,7 @@ public class JobController { public ReturnResult listDept(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody JobSearchParam params) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getJobWrapper(user).listPage(params)); + return ReturnResult.successed(user,getJobWrapper(user).listPage(params)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -87,7 +87,7 @@ public class JobController { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); JobSearchParam param = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), JobSearchParam.class); - return ReturnResult.successed(getJobWrapper(user).getSaveForm(param)); + return ReturnResult.successed(user,getJobWrapper(user).getSaveForm(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -107,7 +107,7 @@ public class JobController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getJobWrapper(user).getJobBaseForm(map)); + return ReturnResult.successed(user,getJobWrapper(user).getJobBaseForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -127,7 +127,7 @@ public class JobController { public ReturnResult saveBaseComp(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Map params) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getJobWrapper(user).saveBaseForm(params)); + return ReturnResult.successed(user,getJobWrapper(user).saveBaseForm(params)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -147,7 +147,7 @@ public class JobController { public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody JobSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getJobWrapper(user).updateForbiddenTagById(param)); + return ReturnResult.successed(user,getJobWrapper(user).updateForbiddenTagById(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -167,7 +167,7 @@ public class JobController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getJobWrapper(user).updateForm(map)); + return ReturnResult.successed(user,getJobWrapper(user).updateForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -187,7 +187,7 @@ public class JobController { public ReturnResult copyJobItem(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody JobCopyParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getJobWrapper(user).copyJobItem(param)); + return ReturnResult.successed(user,getJobWrapper(user).copyJobItem(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -207,7 +207,7 @@ public class JobController { public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getJobWrapper(user).deleteByIds(param.getIds())); + return ReturnResult.successed(user,getJobWrapper(user).deleteByIds(param.getIds())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -226,7 +226,7 @@ public class JobController { public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getJobWrapper(user).getHasRight()); + return ReturnResult.successed(user,getJobWrapper(user).getHasRight()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -239,7 +239,7 @@ public class JobController { try { User user = HrmUserVarify.getUser(request, response); getJobWrapper(user).refresh(); - return ReturnResult.successed(); + return ReturnResult.successed(user); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -258,7 +258,7 @@ public class JobController { public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getJobWrapper(user).getSearchCondition()); + return ReturnResult.successed(user,getJobWrapper(user).getSearchCondition()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -302,7 +302,7 @@ public class JobController { if (StringUtils.isBlank(id)) { id = "0"; } - return ReturnResult.successed(getJobWrapper(user).getMergeForm(Long.parseLong(id))); + return ReturnResult.successed(user,getJobWrapper(user).getMergeForm(Long.parseLong(id))); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -314,7 +314,7 @@ public class JobController { public ReturnResult mergeJob(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody JobMergeParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getJobWrapper(user).mergeJob(param)); + return ReturnResult.successed(user,getJobWrapper(user).mergeJob(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/LevelController.java b/src/com/engine/organization/web/LevelController.java index ed3aea62..32121987 100644 --- a/src/com/engine/organization/web/LevelController.java +++ b/src/com/engine/organization/web/LevelController.java @@ -45,7 +45,7 @@ public class LevelController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getLevelWrapper(user).listPage(map)); + return ReturnResult.successed(user,getLevelWrapper(user).listPage(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -64,7 +64,7 @@ public class LevelController { public ReturnResult saveLevel(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody LevelSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getLevelWrapper(user).saveLevel(param)); + return ReturnResult.successed(user,getLevelWrapper(user).saveLevel(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -84,7 +84,7 @@ public class LevelController { public ReturnResult updateLevel(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody LevelSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getLevelWrapper(user).updateLevel(param)); + return ReturnResult.successed(user,getLevelWrapper(user).updateLevel(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -104,7 +104,7 @@ public class LevelController { public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody LevelSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getLevelWrapper(user).updateForbiddenTagById(param)); + return ReturnResult.successed(user,getLevelWrapper(user).updateForbiddenTagById(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -125,7 +125,7 @@ public class LevelController { public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getLevelWrapper(user).deleteByIds(param.getIds())); + return ReturnResult.successed(user,getLevelWrapper(user).deleteByIds(param.getIds())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -145,7 +145,7 @@ public class LevelController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getLevelWrapper(user).getSearchCondition(map)); + return ReturnResult.successed(user,getLevelWrapper(user).getSearchCondition(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -166,7 +166,7 @@ public class LevelController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getLevelWrapper(user).getLevelForm(map)); + return ReturnResult.successed(user,getLevelWrapper(user).getLevelForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -185,7 +185,7 @@ public class LevelController { public ReturnResult getTableBtn(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getLevelWrapper(user).getTableBtn()); + return ReturnResult.successed(user,getLevelWrapper(user).getTableBtn()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -197,7 +197,7 @@ public class LevelController { public ReturnResult getTabInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getLevelWrapper(user).getTabInfo()); + return ReturnResult.successed(user,getLevelWrapper(user).getTabInfo()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -209,7 +209,7 @@ public class LevelController { public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getLevelWrapper(user).getTreeData()); + return ReturnResult.successed(user,getLevelWrapper(user).getTreeData()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/LogViewController.java b/src/com/engine/organization/web/LogViewController.java index 51eae87f..bdcd2b3f 100644 --- a/src/com/engine/organization/web/LogViewController.java +++ b/src/com/engine/organization/web/LogViewController.java @@ -38,7 +38,7 @@ public class LogViewController { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); LogViewSearchParam params = JSONObject.toJavaObject((JSON) JSON.toJSON(map), LogViewSearchParam.class); - return ReturnResult.successed(getLogViewWrapper(user).listPage(params)); + return ReturnResult.successed(user,getLogViewWrapper(user).listPage(params)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -51,7 +51,7 @@ public class LogViewController { public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getLogViewWrapper(user).getSearchCondition()); + return ReturnResult.successed(user,getLogViewWrapper(user).getSearchCondition()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/ManagerDetachController.java b/src/com/engine/organization/web/ManagerDetachController.java index 16bdfd7f..6d9e7959 100644 --- a/src/com/engine/organization/web/ManagerDetachController.java +++ b/src/com/engine/organization/web/ManagerDetachController.java @@ -37,7 +37,7 @@ public class ManagerDetachController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getManagerDetachWrapper(user).listPage(map)); + return ReturnResult.successed(user,getManagerDetachWrapper(user).listPage(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -50,7 +50,7 @@ public class ManagerDetachController { public ReturnResult getTableBtn(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getManagerDetachWrapper(user).getTableBtn()); + return ReturnResult.successed(user,getManagerDetachWrapper(user).getTableBtn()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -63,7 +63,7 @@ public class ManagerDetachController { public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getManagerDetachWrapper(user).getSearchCondition()); + return ReturnResult.successed(user,getManagerDetachWrapper(user).getSearchCondition()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -76,7 +76,7 @@ public class ManagerDetachController { @QueryParam("id") Integer id) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getManagerDetachWrapper(user).getForm(id)); + return ReturnResult.successed(user,getManagerDetachWrapper(user).getForm(id)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -88,7 +88,7 @@ public class ManagerDetachController { public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getManagerDetachWrapper(user).deleteByIds(param.getIds())); + return ReturnResult.successed(user,getManagerDetachWrapper(user).deleteByIds(param.getIds())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -101,7 +101,7 @@ public class ManagerDetachController { public ReturnResult saveDetach(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ManagerDetachParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getManagerDetachWrapper(user).save(param)); + return ReturnResult.successed(user,getManagerDetachWrapper(user).save(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -113,7 +113,7 @@ public class ManagerDetachController { public ReturnResult updateDetach(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ManagerDetachParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getManagerDetachWrapper(user).updateDetach(param)); + return ReturnResult.successed(user,getManagerDetachWrapper(user).updateDetach(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -126,7 +126,7 @@ public class ManagerDetachController { @QueryParam("idDetach") String isDetach) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getManagerDetachWrapper(user).doDetach(isDetach)); + return ReturnResult.successed(user,getManagerDetachWrapper(user).doDetach(isDetach)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/NonStandardOptController.java b/src/com/engine/organization/web/NonStandardOptController.java index 1395f38a..aed6323f 100644 --- a/src/com/engine/organization/web/NonStandardOptController.java +++ b/src/com/engine/organization/web/NonStandardOptController.java @@ -37,7 +37,7 @@ public class NonStandardOptController { String method = Util.null2String(map.get("method")); String ids = Util.null2String(map.get("ids")); getNonStandardOptWrapper(user).NonStandardOpt(method, ids); - return ReturnResult.successed(); + return ReturnResult.successed(user); } 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 f5c71c06..db5fe356 100644 --- a/src/com/engine/organization/web/OrgChartController.java +++ b/src/com/engine/organization/web/OrgChartController.java @@ -284,7 +284,7 @@ public class OrgChartController { try { User user = HrmUserVarify.getUser(request, response); Map params = ParamUtil.request2Map(request); - return ReturnResult.successed(getOrgChartWrapper(user).synchronousData(params)); + return ReturnResult.successed(user,getOrgChartWrapper(user).synchronousData(params)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -298,7 +298,7 @@ public class OrgChartController { try { User user = HrmUserVarify.getUser(request, response); Map params = ParamUtil.request2Map(request); - return ReturnResult.successed(getOrgChartWrapper(user).selectStatistics(params)); + return ReturnResult.successed(user,getOrgChartWrapper(user).selectStatistics(params)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -311,7 +311,7 @@ public class OrgChartController { public ReturnResult recordStatistics(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StatisticsParam statisticsParam) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getOrgChartWrapper(user).recordStatistics(statisticsParam)); + return ReturnResult.successed(user,getOrgChartWrapper(user).recordStatistics(statisticsParam)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/OrgVirtualController.java b/src/com/engine/organization/web/OrgVirtualController.java index ccc89614..298b3e3d 100644 --- a/src/com/engine/organization/web/OrgVirtualController.java +++ b/src/com/engine/organization/web/OrgVirtualController.java @@ -34,7 +34,7 @@ public class OrgVirtualController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getVirtualWrapper(user).listPage(map)); + return ReturnResult.successed(user,getVirtualWrapper(user).listPage(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/PersonnelCardController.java b/src/com/engine/organization/web/PersonnelCardController.java index be467a1a..25ecefb8 100644 --- a/src/com/engine/organization/web/PersonnelCardController.java +++ b/src/com/engine/organization/web/PersonnelCardController.java @@ -36,7 +36,7 @@ public class PersonnelCardController { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); String id = Util.null2String(map.get("id")); - return ReturnResult.successed(getPersonnelCardWrapper(user).getPersonnelCard(StringUtils.isBlank(id) ? null : Long.parseLong(id))); + return ReturnResult.successed(user,getPersonnelCardWrapper(user).getPersonnelCard(StringUtils.isBlank(id) ? null : Long.parseLong(id))); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -48,7 +48,7 @@ public class PersonnelCardController { public ReturnResult getIframeList(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getPersonnelCardWrapper(user).getIframeList()); + return ReturnResult.successed(user,getPersonnelCardWrapper(user).getIframeList()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/PersonnelResumeController.java b/src/com/engine/organization/web/PersonnelResumeController.java index 6d67f7eb..92eb2eae 100644 --- a/src/com/engine/organization/web/PersonnelResumeController.java +++ b/src/com/engine/organization/web/PersonnelResumeController.java @@ -19,12 +19,12 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import java.io.File; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import javax.ws.rs.core.Response; -import java.io.*; -import java.net.URLEncoder; import java.util.Map; /** @@ -60,7 +60,7 @@ public class PersonnelResumeController { public ReturnResult hasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getPersonnelResumeWrapper(user).hasRight()); + return ReturnResult.successed(user,getPersonnelResumeWrapper(user).hasRight()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -75,7 +75,7 @@ public class PersonnelResumeController { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); Integer uId = Integer.parseInt(Util.null2String(map.get("id"))); - return ReturnResult.successed(getPersonnelResumeWrapper(user).getResumeList(uId)); + return ReturnResult.successed(user,getPersonnelResumeWrapper(user).getResumeList(uId)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -92,7 +92,7 @@ public class PersonnelResumeController { List addGroups = new ArrayList<>(); addGroups.add(new SearchConditionGroup("高级搜索条件", true, getPersonnelResumeWrapper(user).personnelScreening())); returnMap.put("conditions",addGroups); - return ReturnResult.successed(returnMap); + return ReturnResult.successed(user,returnMap); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/PostController.java b/src/com/engine/organization/web/PostController.java index 8abb43ea..f9f2ea35 100644 --- a/src/com/engine/organization/web/PostController.java +++ b/src/com/engine/organization/web/PostController.java @@ -46,7 +46,7 @@ public class PostController { public ReturnResult savePost(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody PostPO postPO) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getPostWrapper(user).savePost(postPO)); + return ReturnResult.successed(user,getPostWrapper(user).savePost(postPO)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -66,7 +66,7 @@ public class PostController { public ReturnResult updatePost(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody PostPO postPO) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getPostWrapper(user).updatePost(postPO)); + return ReturnResult.successed(user,getPostWrapper(user).updatePost(postPO)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -87,7 +87,7 @@ public class PostController { public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getPostWrapper(user).deleteByIds(param.getIds())); + return ReturnResult.successed(user,getPostWrapper(user).deleteByIds(param.getIds())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -108,7 +108,7 @@ public class PostController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getPostWrapper(user).getPostForm(map)); + return ReturnResult.successed(user,getPostWrapper(user).getPostForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -126,7 +126,7 @@ public class PostController { public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getPostWrapper(user).getTreeData()); + return ReturnResult.successed(user,getPostWrapper(user).getTreeData()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/PostInfoController.java b/src/com/engine/organization/web/PostInfoController.java index a9f0a852..99e9be7a 100644 --- a/src/com/engine/organization/web/PostInfoController.java +++ b/src/com/engine/organization/web/PostInfoController.java @@ -45,7 +45,7 @@ public class PostInfoController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getPostInfoWrapper(user).listPage(map)); + return ReturnResult.successed(user,getPostInfoWrapper(user).listPage(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -64,7 +64,7 @@ public class PostInfoController { public ReturnResult savePostInfo(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody PostInfoSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getPostInfoWrapper(user).savePostInfo(param)); + return ReturnResult.successed(user,getPostInfoWrapper(user).savePostInfo(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -84,7 +84,7 @@ public class PostInfoController { public ReturnResult updatePostInfo(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody PostInfoSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getPostInfoWrapper(user).updatePostInfo(param)); + return ReturnResult.successed(user,getPostInfoWrapper(user).updatePostInfo(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -104,7 +104,7 @@ public class PostInfoController { public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody PostInfoSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getPostInfoWrapper(user).updateForbiddenTagById(param)); + return ReturnResult.successed(user,getPostInfoWrapper(user).updateForbiddenTagById(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -125,7 +125,7 @@ public class PostInfoController { public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getPostInfoWrapper(user).deleteByIds(param.getIds())); + return ReturnResult.successed(user,getPostInfoWrapper(user).deleteByIds(param.getIds())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -145,7 +145,7 @@ public class PostInfoController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getPostInfoWrapper(user).getSearchCondition(map)); + return ReturnResult.successed(user,getPostInfoWrapper(user).getSearchCondition(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -166,7 +166,7 @@ public class PostInfoController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getPostInfoWrapper(user).getPostInfoForm(map)); + return ReturnResult.successed(user,getPostInfoWrapper(user).getPostInfoForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -185,7 +185,7 @@ public class PostInfoController { public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getPostInfoWrapper(user).getHasRight()); + return ReturnResult.successed(user,getPostInfoWrapper(user).getHasRight()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/QuickSearchController.java b/src/com/engine/organization/web/QuickSearchController.java index a5bb2e14..4b6e9538 100644 --- a/src/com/engine/organization/web/QuickSearchController.java +++ b/src/com/engine/organization/web/QuickSearchController.java @@ -34,7 +34,7 @@ public class QuickSearchController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getQuickSearchWrapper(user).getQuickSearchCondition(map)); + return ReturnResult.successed(user,getQuickSearchWrapper(user).getQuickSearchCondition(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -47,7 +47,7 @@ public class QuickSearchController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getQuickSearchWrapper(user).getQuickSearchInfo(map)); + return ReturnResult.successed(user,getQuickSearchWrapper(user).getQuickSearchInfo(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -60,7 +60,7 @@ public class QuickSearchController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getQuickSearchWrapper(user).saveQuickSearchInfo(map)); + return ReturnResult.successed(user,getQuickSearchWrapper(user).saveQuickSearchInfo(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -73,7 +73,7 @@ public class QuickSearchController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getQuickSearchWrapper(user).getQuickSearchDetailInfo(map)); + return ReturnResult.successed(user,getQuickSearchWrapper(user).getQuickSearchDetailInfo(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -86,7 +86,7 @@ public class QuickSearchController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getQuickSearchWrapper(user).saveQuickSearchDetailInfo(map)); + return ReturnResult.successed(user,getQuickSearchWrapper(user).saveQuickSearchDetailInfo(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/ResourceBasicInfoController.java b/src/com/engine/organization/web/ResourceBasicInfoController.java index 559b188f..a49efadd 100644 --- a/src/com/engine/organization/web/ResourceBasicInfoController.java +++ b/src/com/engine/organization/web/ResourceBasicInfoController.java @@ -39,7 +39,7 @@ public class ResourceBasicInfoController { public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getResourceBasicInfoWrapper(user).getHasRight()); + return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).getHasRight()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -53,7 +53,7 @@ public class ResourceBasicInfoController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getResourceBasicInfoWrapper(user).getResourceBasicInfo(map)); + return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).getResourceBasicInfo(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -66,7 +66,7 @@ public class ResourceBasicInfoController { public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getResourceBasicInfoWrapper(user).getTreeData()); + return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).getTreeData()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -79,7 +79,7 @@ public class ResourceBasicInfoController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getResourceBasicInfoWrapper(user).getForm(map)); + return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).getForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -92,7 +92,7 @@ public class ResourceBasicInfoController { public ReturnResult delete(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getResourceBasicInfoWrapper(user).deleteByIds(param.getIds())); + return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).deleteByIds(param.getIds())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -105,7 +105,7 @@ public class ResourceBasicInfoController { public ReturnResult recover(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getResourceBasicInfoWrapper(user).recoverByIds(param.getIds())); + return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).recoverByIds(param.getIds())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -117,7 +117,7 @@ public class ResourceBasicInfoController { public ReturnResult save(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ResourceItemPO resourceItemPO) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getResourceBasicInfoWrapper(user).save(resourceItemPO)); + return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).save(resourceItemPO)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -129,7 +129,7 @@ public class ResourceBasicInfoController { public ReturnResult update(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ResourceItemPO resourceItemPO) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getResourceBasicInfoWrapper(user).update(resourceItemPO)); + return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).update(resourceItemPO)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -142,7 +142,7 @@ public class ResourceBasicInfoController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getResourceBasicInfoWrapper(user).getItemClassForm(map)); + return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).getItemClassForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -154,7 +154,7 @@ public class ResourceBasicInfoController { public ReturnResult saveResourceItemClass(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ResourceItemClassPO resourceItemClassPO) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getResourceBasicInfoWrapper(user).saveResourceItemClass(resourceItemClassPO)); + return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).saveResourceItemClass(resourceItemClassPO)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -166,7 +166,7 @@ public class ResourceBasicInfoController { public ReturnResult updateResourceItemClass(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ResourceItemClassPO resourceItemClassPO) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getResourceBasicInfoWrapper(user).updateResourceItemClass(resourceItemClassPO)); + return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).updateResourceItemClass(resourceItemClassPO)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -178,7 +178,7 @@ public class ResourceBasicInfoController { public ReturnResult deleteResourceItemClass(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Integer fid) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getResourceBasicInfoWrapper(user).deleteResourceItemClass(fid)); + return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).deleteResourceItemClass(fid)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -190,7 +190,7 @@ public class ResourceBasicInfoController { public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getResourceBasicInfoWrapper(user).getSearchCondition()); + return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).getSearchCondition()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/SequenceController.java b/src/com/engine/organization/web/SequenceController.java index 0ba3f426..d6f111e8 100644 --- a/src/com/engine/organization/web/SequenceController.java +++ b/src/com/engine/organization/web/SequenceController.java @@ -45,7 +45,7 @@ public class SequenceController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getSequenceWrapper(user).listPage(map)); + return ReturnResult.successed(user,getSequenceWrapper(user).listPage(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -64,7 +64,7 @@ public class SequenceController { public ReturnResult saveSequence(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SequenceSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getSequenceWrapper(user).saveSequence(param)); + return ReturnResult.successed(user,getSequenceWrapper(user).saveSequence(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -84,7 +84,7 @@ public class SequenceController { public ReturnResult updateSequence(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SequenceSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getSequenceWrapper(user).updateSequence(param)); + return ReturnResult.successed(user,getSequenceWrapper(user).updateSequence(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -104,7 +104,7 @@ public class SequenceController { public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SequenceSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getSequenceWrapper(user).updateForbiddenTagById(param)); + return ReturnResult.successed(user,getSequenceWrapper(user).updateForbiddenTagById(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -125,7 +125,7 @@ public class SequenceController { public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getSequenceWrapper(user).deleteByIds(param.getIds())); + return ReturnResult.successed(user,getSequenceWrapper(user).deleteByIds(param.getIds())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -145,7 +145,7 @@ public class SequenceController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getSequenceWrapper(user).getSearchCondition(map)); + return ReturnResult.successed(user,getSequenceWrapper(user).getSearchCondition(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -166,7 +166,7 @@ public class SequenceController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getSequenceWrapper(user).getSequenceForm(map)); + return ReturnResult.successed(user,getSequenceWrapper(user).getSequenceForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -185,7 +185,7 @@ public class SequenceController { public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getSequenceWrapper(user).getHasRight()); + return ReturnResult.successed(user,getSequenceWrapper(user).getHasRight()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -197,7 +197,7 @@ public class SequenceController { public ReturnResult getTabInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getSequenceWrapper(user).getTabInfo()); + return ReturnResult.successed(user,getSequenceWrapper(user).getTabInfo()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -210,7 +210,7 @@ public class SequenceController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getSequenceWrapper(user).getSchemeInfo(map)); + return ReturnResult.successed(user,getSequenceWrapper(user).getSchemeInfo(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/StaffController.java b/src/com/engine/organization/web/StaffController.java index fc8d9ebe..9fd115af 100644 --- a/src/com/engine/organization/web/StaffController.java +++ b/src/com/engine/organization/web/StaffController.java @@ -49,7 +49,7 @@ public class StaffController { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); StaffSerachParam param = JSONObject.toJavaObject((JSON) JSON.toJSON(map), StaffSerachParam.class); - return ReturnResult.successed(getStaffWrapper(user).listPage(param)); + return ReturnResult.successed(user,getStaffWrapper(user).listPage(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -68,7 +68,7 @@ public class StaffController { public ReturnResult saveStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffParams param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getStaffWrapper(user).saveStaff(param)); + return ReturnResult.successed(user,getStaffWrapper(user).saveStaff(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -88,7 +88,7 @@ public class StaffController { public ReturnResult updateStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffParams param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getStaffWrapper(user).updateStaff(param)); + return ReturnResult.successed(user,getStaffWrapper(user).updateStaff(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -109,7 +109,7 @@ public class StaffController { public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getStaffWrapper(user).deleteByIds(param.getIds())); + return ReturnResult.successed(user,getStaffWrapper(user).deleteByIds(param.getIds())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -129,7 +129,7 @@ public class StaffController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getStaffWrapper(user).getSearchCondition(map)); + return ReturnResult.successed(user,getStaffWrapper(user).getSearchCondition(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -150,7 +150,7 @@ public class StaffController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getStaffWrapper(user).getForm(map)); + return ReturnResult.successed(user,getStaffWrapper(user).getForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -169,7 +169,7 @@ public class StaffController { public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getStaffWrapper(user).getHasRight()); + return ReturnResult.successed(user,getStaffWrapper(user).getHasRight()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/StaffOutController.java b/src/com/engine/organization/web/StaffOutController.java index a9f9bb2b..fe83f92a 100644 --- a/src/com/engine/organization/web/StaffOutController.java +++ b/src/com/engine/organization/web/StaffOutController.java @@ -36,7 +36,7 @@ public class StaffOutController { public ReturnResult changeStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(staffOutService(user).changeStaff(staffOutParam)); + return ReturnResult.successed(user,staffOutService(user).changeStaff(staffOutParam)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -48,7 +48,7 @@ public class StaffOutController { public ReturnResult transactionOnJob(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(staffOutService(user).transactionOnJob(staffOutParam)); + return ReturnResult.successed(user,staffOutService(user).transactionOnJob(staffOutParam)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/StaffPlanController.java b/src/com/engine/organization/web/StaffPlanController.java index 4f8fde87..d859acb7 100644 --- a/src/com/engine/organization/web/StaffPlanController.java +++ b/src/com/engine/organization/web/StaffPlanController.java @@ -48,7 +48,7 @@ public class StaffPlanController { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); StaffPlanSearchParam param = JSONObject.toJavaObject((JSON) JSON.toJSON(map), StaffPlanSearchParam.class); - return ReturnResult.successed(getStaffPlanWrapper(user).listPage(param)); + return ReturnResult.successed(user,getStaffPlanWrapper(user).listPage(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -67,7 +67,7 @@ public class StaffPlanController { public ReturnResult saveStaffPlan(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffPlanSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getStaffPlanWrapper(user).saveStaffPlan(param)); + return ReturnResult.successed(user,getStaffPlanWrapper(user).saveStaffPlan(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -87,7 +87,7 @@ public class StaffPlanController { public ReturnResult updateStaffPlan(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffPlanSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getStaffPlanWrapper(user).updateStaffPlan(param)); + return ReturnResult.successed(user,getStaffPlanWrapper(user).updateStaffPlan(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -107,7 +107,7 @@ public class StaffPlanController { public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffPlanSearchParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getStaffPlanWrapper(user).updateForbiddenTagById(param)); + return ReturnResult.successed(user,getStaffPlanWrapper(user).updateForbiddenTagById(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -128,7 +128,7 @@ public class StaffPlanController { public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getStaffPlanWrapper(user).deleteByIds(param.getIds())); + return ReturnResult.successed(user,getStaffPlanWrapper(user).deleteByIds(param.getIds())); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -148,7 +148,7 @@ public class StaffPlanController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getStaffPlanWrapper(user).getSearchCondition(map)); + return ReturnResult.successed(user,getStaffPlanWrapper(user).getSearchCondition(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -169,7 +169,7 @@ public class StaffPlanController { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - return ReturnResult.successed(getStaffPlanWrapper(user).getForm(map)); + return ReturnResult.successed(user,getStaffPlanWrapper(user).getForm(map)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -188,7 +188,7 @@ public class StaffPlanController { public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getStaffPlanWrapper(user).getHasRight()); + return ReturnResult.successed(user,getStaffPlanWrapper(user).getHasRight()); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/web/VersionManageController.java b/src/com/engine/organization/web/VersionManageController.java index fd873077..471997b0 100644 --- a/src/com/engine/organization/web/VersionManageController.java +++ b/src/com/engine/organization/web/VersionManageController.java @@ -36,7 +36,7 @@ public class VersionManageController { User user = HrmUserVarify.getUser(request, response); Map params = ParamUtil.request2Map(request); getVersionManageWrapper(user).save(moduleTypeEnum,params); - return ReturnResult.successed(); + return ReturnResult.successed(user); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } @@ -51,7 +51,7 @@ public class VersionManageController { User user = HrmUserVarify.getUser(request, response); Map params = ParamUtil.request2Map(request); Map map = getVersionManageWrapper(user).getVersion(moduleTypeEnum,params); - return ReturnResult.successed(map); + return ReturnResult.successed(user,map); } catch (Exception e) { return ReturnResult.exceptionHandle(e); } diff --git a/src/com/engine/organization/wrapper/CodeSettingWrapper.java b/src/com/engine/organization/wrapper/CodeSettingWrapper.java index 1ac60a5e..66ced960 100644 --- a/src/com/engine/organization/wrapper/CodeSettingWrapper.java +++ b/src/com/engine/organization/wrapper/CodeSettingWrapper.java @@ -25,6 +25,6 @@ public class CodeSettingWrapper extends Service { } public ReturnResult saveOrUpdateCodeSetting(CodeSaveParam params) { - return ReturnResult.successed(getCodeSettingService(user).saveOrUpdateCodeSetting(params)); + return ReturnResult.successed(user,getCodeSettingService(user).saveOrUpdateCodeSetting(params)); } } diff --git a/src/com/engine/organization/wrapper/DepartmentWrapper.java b/src/com/engine/organization/wrapper/DepartmentWrapper.java index 1deaad06..64558458 100644 --- a/src/com/engine/organization/wrapper/DepartmentWrapper.java +++ b/src/com/engine/organization/wrapper/DepartmentWrapper.java @@ -59,7 +59,7 @@ public class DepartmentWrapper extends OrganizationWrapper { public ReturnResult getDeptListByPid(QuerySingleDeptListParam param) { PageInfo singleDeptTreeVOS = getDepartmentService(user).getDeptListByPid(param); - return ReturnResult.successed(singleDeptTreeVOS); + return ReturnResult.successed(user,singleDeptTreeVOS); } /** diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index 3c393290..4b976ef6 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -31,7 +31,7 @@ public class FieldDefinedWrapper extends Service { public ReturnResult getTree(ModuleTypeEnum moduleTypeEnum) { List treeDTOS = getFieldDefinedService(user).getTree(moduleTypeEnum); - return ReturnResult.successed(treeDTOS); + return ReturnResult.successed(user,treeDTOS); } /** @@ -67,7 +67,7 @@ public class FieldDefinedWrapper extends Service { public ReturnResult changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { getFieldDefinedService(user).changeTree(moduleTypeEnum, fieldTypeTreeParam); - return ReturnResult.successed(); + return ReturnResult.successed(user); } @@ -78,12 +78,12 @@ public class FieldDefinedWrapper extends Service { public ReturnResult deleteTree(Long id) { getFieldDefinedService(user).deleteTree(id); - return ReturnResult.successed(); + return ReturnResult.successed(user); } public ReturnResult saveTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) { getFieldDefinedService(user).saveTree(moduleTypeEnum, fieldTypeTreeParam); - return ReturnResult.successed(); + return ReturnResult.successed(user); } public int saveFields(String data) { diff --git a/src/com/engine/organization/wrapper/JobWrapper.java b/src/com/engine/organization/wrapper/JobWrapper.java index 808c7e92..ab408e79 100644 --- a/src/com/engine/organization/wrapper/JobWrapper.java +++ b/src/com/engine/organization/wrapper/JobWrapper.java @@ -203,7 +203,7 @@ public class JobWrapper extends OrganizationWrapper { deptBrowserItem.setRules("required|string"); condition.add(deptBrowserItem); addGroups.add(new SearchConditionGroup("", true, condition)); - return ReturnResult.successed(addGroups); + return ReturnResult.successed(user,addGroups); } /** @@ -214,7 +214,7 @@ public class JobWrapper extends OrganizationWrapper { */ public ReturnResult getHrmListByJobId(Long jobId) { Map hrmListByJobId = getJobService(user).getHrmListByJobId(jobId); - return ReturnResult.successed(hrmListByJobId); + return ReturnResult.successed(user,hrmListByJobId); } public List getMergeForm(Long id) {