From 3285e44658bc7df0108f120c465f875cb38c160b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 3 Sep 2021 14:54:02 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E8=AE=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=EF=BC=8C=E6=89=8B=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/meeting/controller/PayMeetingController.java    | 4 ++++
 .../com/jero/meeting/service/impl/PayMeetingServiceImpl.java | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index 8a8e3767..480a64fe 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
 import com.jero.meeting.entity.PayMeeting;
 import com.jero.meeting.service.IPayMeetingService;
@@ -51,6 +52,9 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
 		QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
 		Page<PayMeeting> page = new Page<>(pageNo, pageSize);
 		IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
+		for (PayMeeting meeting : pageList.getRecords()) {
+			meeting.setDirectorPhone(PasswordUtil.decrypt(meeting.getDirectorPhone()));
+		}
 		return Result.OK(pageList);
 	}
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index dbbfd155..428e9b2e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -69,7 +69,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 		String directorId = payMeetingVO.getDirectorId();
 		LoginUser loginUser = sysBaseApi.getUserById(directorId);
 		if (loginUser == null) {
-			throw new JeroBootException("会议联系人不存在");
+			throw new JeroBootException("会议负责人不存在");
+		}else{
+			payMeetingVO.setDirectorName(loginUser.getUsername());
+			payMeetingVO.setDirectorPhone(loginUser.getPhone());
 		}
 
 		//根据会议类型进行校验