From 4ea06e68ca6668eaa1f474d68fc868201ab589eb Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 15 Mar 2024 17:47:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=EF=BC=8C=E5=87=BA=E5=B7=AE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=98=8E=E7=BB=86=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/web/BusinessTripsApplyApi.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/com/engine/attendance/workflow/web/BusinessTripsApplyApi.java b/src/com/engine/attendance/workflow/web/BusinessTripsApplyApi.java index af284c8..c05b222 100644 --- a/src/com/engine/attendance/workflow/web/BusinessTripsApplyApi.java +++ b/src/com/engine/attendance/workflow/web/BusinessTripsApplyApi.java @@ -2,11 +2,9 @@ package com.engine.attendance.workflow.web; import com.engine.attendance.workflow.service.BusinessTripsApplyService; import com.engine.attendance.workflow.service.impl.BusinessTripsApplyServiceImpl; +import com.engine.common.util.ApiReturnTools; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.jucailin.service.KQCalendarSettingService; -import com.engine.jucailin.service.impl.KQCalendarSettingServiceImpl; -import com.engine.jucailin.util.ResponseResult; import lombok.extern.slf4j.Slf4j; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; @@ -40,9 +38,14 @@ public class BusinessTripsApplyApi { @Path("/getBusinessTripsApplyList") @Produces(MediaType.APPLICATION_JSON) public String getBusinessTripsApplyList(@Context HttpServletRequest request, @Context HttpServletResponse response) { - User user = HrmUserVarify.getUser(request, response); - Map param = ParamUtil.request2Map(request); - return new ResponseResult, Map>(user).run(getBusinessTripsApplyService(user) :: getBusinessTripsApplyList,param); + try { + User user = HrmUserVarify.getUser(request, response); + Map param = ParamUtil.request2Map(request); + return ApiReturnTools.success(getBusinessTripsApplyService(user).getBusinessTripsApplyList(param)); + }catch (Exception e){ + log.error("execute fail,catch error: [{}]",e); + return ApiReturnTools.error("500","getBusinessTripsApplyList error"); + } } }