From 3f7f49955feb50908c5163cd3124b4053e6d3c79 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 17 Aug 2022 10:46:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E7=AE=A1=E7=90=86-=E7=BC=96=E8=BE=91=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayManagerManagementController.java          | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java
index a402e7ec..a63d16e5 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java
@@ -162,8 +162,16 @@ public class PayManagerManagementController extends JeroController<PayManagerMan
 	@AutoLog(value = "企业管理员管理-编辑")
 	@ApiOperation(value="企业管理员管理-编辑", notes="企业管理员管理-编辑")
 	@PostMapping(value = "/edit")
-	public Result<?> edit(@Validated @RequestBody PayManagerManagement payManagerManagement) {
-
+	public Result<?> edit(@RequestBody PayManagerManagement payManagerManagement) {
+		String rsaPublicKey = payManagerManagement.getRsaPublicKey();
+		String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey));
+		String phone = payManagerManagement.getPhone();
+		try{
+			phone = CommonUtils.decryptBtRsaPriKey(phone, rsaPrivateKey);
+		}catch (Exception e){
+			throw new JeroBootException("解密失败！", e);
+		}
+		payManagerManagement.setPhone(phone);
 		StringBuilder msg = ValidUtil.validateAll(payManagerManagement);
 		if(!StringUtils.isBlank(msg)){
 			return Result.error(msg.toString());
@@ -179,10 +187,10 @@ public class PayManagerManagementController extends JeroController<PayManagerMan
 		}
 
 		try {
-			String phone = PasswordUtil.encrypt(payManagerManagement.getPhone());
+			String phone1 = PasswordUtil.encrypt(payManagerManagement.getPhone());
 			// 编辑保存管理员前再次校验手机号是否存在
 			LambdaQueryWrapper<PayManagerManagement> queryWrapper = new LambdaQueryWrapper<>();
-			queryWrapper.eq(PayManagerManagement::getPhone,phone);
+			queryWrapper.eq(PayManagerManagement::getPhone,phone1);
 			PayManagerManagement payManagerManagementNew = payManagerManagementService.getOne(queryWrapper);
 			// 手机号存在，并且编辑id与查询不同，则校验不通过
 			if(!Objects.isNull(payManagerManagementNew) && !Objects.equals(payManagerManagementNew.getId(),payManagerManagement.getId())) {