From b76472d56b86434e5a30e920dacf01526a1e2c5d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 15 Aug 2023 11:35:10 +0800
Subject: [PATCH] 险情上报水库模糊查询

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java
index 48bd969..4cf1373 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java
@@ -85,23 +85,27 @@
 		String encodeCreateUserName = "";
 		//转码后的处理人
 		String encodeToUserName = "";
+		String encodeDesinfo = "";
 		R<User> userR = userClient.userInfoById(Long.parseLong(dangerReportSUPO.getToUser()));
+		R<User> createUser = userClient.userInfoById(dangerReportSUPO.getCreateUser());
 
 		try {
 			encodeReservoirName= URLEncoder.encode(attResBase.getName(), "UTF-8");
-			encodeCreateUserName = URLEncoder.encode(AuthUtil.getUser().getUserName(), "UTF-8");
+			encodeCreateUserName = URLEncoder.encode(createUser.getData().getName(), "UTF-8");
 			encodeToUserName=URLEncoder.encode(userR.getData().getName(), "UTF-8");
+			encodeDesinfo = URLEncoder.encode(dangerReport.getDesinfo(), "UTF-8");
 		}catch (Exception e){
 			System.out.println(e);
 		}
 
 
 		dangerReportSUPO.setReservoirName(encodeReservoirName);
-		dangerReport.setReservoirName(encodeReservoirName); // 保存水库名称
+		dangerReport.setReservoirName(attResBase.getName()); // 保存水库名称
 
 		// 获取用户
 		dangerReportSUPO.setCreateUserName(encodeCreateUserName);
 		dangerReportSUPO.setToUserName(encodeToUserName);
+		dangerReportSUPO.setDesinfo(encodeDesinfo);
 
 		String message = JSONObject.toJSONString(dangerReportSUPO);
 		R<CBCResultDTO> cbcResultDTOR =  pwdClient.getCBCMacEncipher(message);

--
Gitblit v1.9.3