From ea5809ac15b3b941a8566be61219b19d40ab5498 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 15 Oct 2024 16:08:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=88=B6=E5=AF=B9=E5=A4=96=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3esb=E7=BC=BA=E5=B0=91UESE=E5=AF=B9=E8=B1=A1=E6=97=B6?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=A2=9E=E5=8A=A0sysadmin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FunctionOutStaffServiceImpl.java      |  3 +--
 .../engine/organization/web/StaffOutController.java    | 10 ++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

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<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum(),staffPO.getPermanentNum());
+        List<Integer> 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);