From 33ab2effd00466b262eacdc5f795c7f2a092b15d Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Fri, 22 Oct 2021 10:56:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=8D=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/mail/controller/PayMailBillController.java  | 2 ++
 .../com/jero/mail/controller/PayMailContractController.java   | 2 ++
 .../main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml  | 4 ++--
 .../com/jero/project/mapper/xml/PayWorkingGroupMapper.xml     | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
index ef4d5780..87fd213f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
@@ -153,6 +153,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	 public Result<?> editTwo(@RequestBody PayMailBill payMailBill
 	 ) {
 		 payMailBill.setPostStatus(1);
+		 payMailBill.setContactMobile(PasswordUtil.encrypt(payMailBill.getContactMobile()));
 		 payMailBillService.updateById(payMailBill);
 		 return Result.OK("操作成功!");
 	 }
@@ -168,6 +169,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
 	@PostMapping(value = "/edit")
 	public Result<?> edit(@RequestBody PayMailBill payMailBill)  {
 		LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
+		payMailBill.setContactMobile(PasswordUtil.encrypt(payMailBill.getContactMobile()));
 		 payMailBill.setPostStatus(1);
 		payMailBill.setMailer(sysUser.getUsername());
 		 payMailBillService.updateById(payMailBill);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
index 7d066c94..5c39118f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
@@ -116,6 +116,7 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 		 LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
 				PayMailContract payMailContractData = payMailContractService.getById(payMailContract.getId());
 				payMailContract.setPostStatus(1);
+		 payMailContract.setMobile(PasswordUtil.encrypt(payMailContract.getMobile()));
 		 		payMailContract.setMailer(sysUser.getUsername());
 				payMailContractService.updateById(payMailContract);
 
@@ -152,6 +153,7 @@ public class PayMailContractController extends JeroController<PayMailContract, I
 	 public Result<?> edit(@RequestBody PayMailContract payMailContract
 	 ) {
 		 payMailContract.setPostStatus(1);
+		 payMailContract.setMobile(PasswordUtil.encrypt(payMailContract.getMobile()));
 		 payMailContractService.updateById(payMailContract);
 
 		 return Result.OK("操作成功!");
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
index 12a5ca91..dd80a221 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
@@ -74,9 +74,9 @@
         post_no as postNo,
         send_date as sendDate,
         pmb.remark
-        from  pay_mail_bill pmb left join pay_mail_bill_project pmbp on(pmb.id=pmbp.bill_id) group by pmb.id
+        from  pay_mail_bill pmb left join pay_mail_bill_project pmbp on(pmb.id=pmbp.bill_id)
  ${ew.customSqlSegment}
- ORDER BY post_status ASC,create_time DESC
+  group by pmb.id ORDER BY post_status ASC,create_time DESC
 
     </select>
     <select id="print" resultType="com.jero.mail.entity.PayMailBill">
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index ce2eb942..aeb3ed9a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -143,7 +143,7 @@
         <where>
             pwgs.comeAllMoney is not null
             <if test="ids != null and ids != ''">
-                pwg.principal_id_a in
+               and  pwg.principal_id_a in
                 <foreach item="item" open="(" separator="," close=")" collection="ids">
                     #{item}
                 </foreach>
@@ -196,7 +196,7 @@
                 </foreach>
             </if>
             <if test="idss != null and idss != ''">
-                pwg.id in
+               and pwg.id in
                 <foreach item="items" open="(" separator="," close=")" collection="idss">
                     #{items}
                 </foreach>