diff --git a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java index 20e172e7..778c25bb 100644 --- a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java @@ -81,7 +81,7 @@ public class FunctionOutStaffServiceImpl { OrganizationAssert.isFalse(staffPO.getFreezeNum() == 0, SystemEnv.getHtmlLabelName(547949,user.getLanguage())); } - List numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum(),staffPO.getPermanentNum()); + List numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum()); //1.增加冻结数 (num为负数时为减少冻结数) Integer sum = numberF.stream() .mapToInt(Integer::intValue) @@ -233,7 +233,6 @@ public class FunctionOutStaffServiceImpl { bb.writeLog("编制参数"+ JSON.toJSONString(param)); bb.writeLog("查询结果"+ JSON.toJSONString(staffPO)); bb.writeLog("user对象"+JSON.toJSONString(user)); - bb.writeLog("msg"+SystemEnv.getHtmlLabelName(547474,user.getLanguage())); OrganizationAssert.notEmpty(staffPO,SystemEnv.getHtmlLabelName(547474,user.getLanguage())); return staffPO.get(0); } diff --git a/src/com/engine/organization/web/StaffOutController.java b/src/com/engine/organization/web/StaffOutController.java index fe83f92a..53dde409 100644 --- a/src/com/engine/organization/web/StaffOutController.java +++ b/src/com/engine/organization/web/StaffOutController.java @@ -36,6 +36,11 @@ public class StaffOutController { public ReturnResult changeStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) { try { User user = HrmUserVarify.getUser(request, response); + //ESB接口user对象是null + if (user == null) { + user = new User(); + user.setUid(1); + } return ReturnResult.successed(user,staffOutService(user).changeStaff(staffOutParam)); } catch (Exception e) { return ReturnResult.exceptionHandle(e); @@ -48,6 +53,11 @@ public class StaffOutController { public ReturnResult transactionOnJob(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) { try { User user = HrmUserVarify.getUser(request, response); + //ESB接口user对象是null + if (user == null) { + user = new User(); + user.setUid(1); + } return ReturnResult.successed(user,staffOutService(user).transactionOnJob(staffOutParam)); } catch (Exception e) { return ReturnResult.exceptionHandle(e);