From 6b6c910ecf5dd410e6d6bc58a77af97371653cd5 Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Wed, 27 Oct 2021 09:14:36 +0800
Subject: [PATCH] fixbug:41485,41439

---
 .../PayContactsManagementController.java      | 27 ++++++++++++-------
 .../entity/PayMemberProjectSubitem.java       |  4 +--
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
index 0a7f16f4..41f96251 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
@@ -17,6 +17,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.ImportExcelUtil;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.ValidUtil;
@@ -42,6 +43,7 @@ import com.jero.project.service.IPayWorkingGroupSubItemService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -634,17 +636,22 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	 @ApiOperation(value="联系人管理-通过id查询-会议对外开放接口", notes="联系人管理-通过id查询-会议对外开放接口")
 	 @GetMapping(value = "/queryByIdMeeting")
 	 public Result<?> queryByIdMeeting(@RequestParam(name="id") String id) {
-		 PayContactsManagement payContactsManagement = payContactsManagementService.getById(id);
-		 if(payContactsManagement == null) {
-			 return Result.error("未找到对应数据");
+		 LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 if(sysUser.getId().equals(id)) {
+			 PayContactsManagement payContactsManagement = payContactsManagementService.getById(id);
+			 if (payContactsManagement == null) {
+				 return Result.error("未找到对应数据");
+			 }
+			 if (!StringUtils.isBlank(payContactsManagement.getPhone())) {
+				 payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
+			 }
+			 if (!StringUtils.isBlank(payContactsManagement.getEmail())) {
+				 payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
+			 }
+			 return Result.OK(payContactsManagement);
+		 }else {
+		 	return Result.OK("权限异常");
 		 }
-		 if (!StringUtils.isBlank(payContactsManagement.getPhone())){
-			 payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
-		 }
-		 if (!StringUtils.isBlank(payContactsManagement.getEmail())){
-			 payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
-		 }
-		 return Result.OK(payContactsManagement);
 	 }
 
 	/**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
index 49d8ae02..edcac9ee 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
@@ -115,7 +115,7 @@ public class PayMemberProjectSubitem implements Serializable {
     /**
      * 企业联系人临时id
      */
-    @Excel(name = "企业联系人名称", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "2")
+    @Excel(name = "企业联系人", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "2")
     private String companyContactTemporaryId;
 
     /**
@@ -134,7 +134,7 @@ public class PayMemberProjectSubitem implements Serializable {
     /**
      * 邮寄联系人临时id
      */
-    @Excel(name = "邮寄联系人姓名", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3")
+    @Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3")
     private String postContactTemporaryId;
 
     /**