From 1c09904647b2c065dbc860d25322deb6b6a5e725 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 2 Nov 2021 14:52:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041826=20=E5=AF=B9=E6=8E=A5=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E4=BC=9A=E4=BA=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=94=B6=E5=88=B0?=
 =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/meeting/entity/PayMeetingSituation.java  | 1 -
 .../service/impl/PayMeetingSituationServiceImpl.java       | 7 ++++++-
 .../com/jero/member/mapper/xml/TbMemberProjectMapper.xml   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
index 3c89c714..4b1e849d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
@@ -255,7 +255,6 @@ public class PayMeetingSituation implements Serializable {
 
 	/**邮寄联系人*/
     @Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id")
-    @ApiModelProperty(value = "邮寄联系人")
     private String postContactId;
 
     /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index a731eefd..8fcf0f5d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -811,8 +811,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         }
         //如果是对接人修改的
         if (sysUserId.equals(dockId)) {
+            PayMeetingSituation newObject = new PayMeetingSituation();
+            BeanUtils.copyProperties(payMeetingSituation1, newObject);
+
+            newObject.setPhone(PasswordUtil.decrypt(newObject.getPhone()));
+            oldObject.setPhone(PasswordUtil.decrypt(oldObject.getPhone()));
             //判断修改了那些字段
-            ObjRecordUtilModule objRecordUtilModule = ObjRecordUtil.addRecord(oldObject, payMeetingSituation1);
+            ObjRecordUtilModule objRecordUtilModule = ObjRecordUtil.addRecord(oldObject, newObject);
             String record = objRecordUtilModule.getInfo();
             if (StringUtils.isNotBlank(record)) {
                 // 给负责人发送消息
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectMapper.xml
index 14378706..1507d80b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectMapper.xml
@@ -11,7 +11,7 @@
     </resultMap>
 
     <select id="queryPageList" resultMap="TbMemberProjectResultMap">
-        select tmp.* from tb_member_project tmp
+        select distinct tmp.* from tb_member_project tmp
             left join pay_meeting pm on tmp.id = pm.standards_id
         ${ew.customSqlSegment}
     </select>