From 4918c9ad2c5807dd5b5dc3b2cc0a9a74031d4278 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 七月 2025 10:20:37 +0800
Subject: [PATCH] 修改三方对接逻辑和环境参数配置

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java
index fc5a234..cf74b7e 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java
@@ -58,7 +58,7 @@
 	 * @param request
 	 * @return
 	 */
-	public static Boolean editStaffNode(EditStaffNodeRequest request){
+	public static ResultUtil editStaffNode(EditStaffNodeRequest request){
 		//请求路径
 		String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/editStaffNode";
 		//私钥文件
@@ -86,15 +86,18 @@
 		String retCode = jsonObject.getString("retCode");
 		if (!"0".equals(retCode)) {
 			log.error("【企业修改员工信息】请求失败:" + result);
-			throw new RuntimeException("【企业修改员工信息】请求失败:" + result);
+			String retMsg = jsonObject.getString("retMsg");
+			retMsg = retMsg.substring(retMsg.indexOf("{"));
+			jsonObject = JSON.parseObject(retMsg);
+			return ResultUtil.error("【企业修改员工信息】请求失败:" + jsonObject.getString("msg"));
 		}
 		JSONObject object = jsonObject.getJSONObject("object");
 		String status = object.getString("status");
 		if (!"0".equals(status)) {
 			log.error("【企业修改员工信息】失败:" + object.toJSONString());
-			throw new RuntimeException("【企业修改员工信息】失败:" + object.toJSONString());
+			return ResultUtil.error("【企业修改员工信息】失败:" + object.toJSONString());
 		}
-		return true;
+		return ResultUtil.success();
 	}
 	
 	
@@ -132,7 +135,10 @@
 		String retCode = jsonObject.getString("retCode");
 		if (!"0".equals(retCode)) {
 			log.error("【企业删除人员】请求失败:" + result);
-			return ResultUtil.error("【企业删除人员】请求失败:" + result);
+			String retMsg = jsonObject.getString("retMsg");
+			retMsg = retMsg.substring(retMsg.indexOf("{"));
+			jsonObject = JSON.parseObject(retMsg);
+			return ResultUtil.error("【企业删除人员】请求失败:" + jsonObject.getString("msg"));
 		}
 		JSONObject object = jsonObject.getJSONObject("object");
 		String status = object.getString("status");
@@ -222,7 +228,10 @@
 		String retCode = jsonObject.getString("retCode");
 		if (!"0".equals(retCode)) {
 			log.error("【企业增加员工】请求失败:" + result);
-			return ResultUtil.error("【企业增加员工】请求失败:" + result);
+			String retMsg = jsonObject.getString("retMsg");
+			retMsg = retMsg.substring(retMsg.indexOf("{"));
+			jsonObject = JSON.parseObject(retMsg);
+			return ResultUtil.error("【企业增加员工】请求失败:" + jsonObject.getString("msg"));
 		}
 		JSONObject object = jsonObject.getJSONObject("object");
 		String status = object.getString("status");

--
Gitblit v1.7.1