From 96f01589e82e0d819d46d5d62f3dc999edb809a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Mon, 11 Oct 2021 12:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayCompanyManagementController.java       | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
index c3fe8f74..5878d10c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
@@ -102,6 +102,9 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 					if (!StringUtils.isBlank(p.getCompanyPhone())){
 						p.setCompanyPhone(PasswordUtil.decrypt(p.getCompanyPhone()));
 					}
+//					if(!Objects.equals(p.getStatus(),PayCompanyManagementCommon.STATUS1)){
+//						p.setCompanyName(p.getCompanyName() + PayCompanyManagementCommon.COMPANY_STATUS);
+//					}
 				});
 				pageList.setRecords(listPayCompanyManagement);
 			}catch (Exception e){
@@ -207,6 +210,9 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 				 if(!StringUtils.isBlank(item.getEmail())){
 					 sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail()));
 				 }
+				 if(!StringUtils.isEmpty(item.getPhone())){
+					 sendMessageDTO.setPhone(PasswordUtil.decrypt(item.getPhone()));
+				 }
 				 HashMap<String,String> map = new HashMap<>();
 				 sendMessageDTO.setFromUser("admin");
 				 sendMessageDTO.setToUser(item.getUsername());
@@ -238,7 +244,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 		// 查看角色是否为财务人员
 		int dataSource = PayCompanyManagementCommon.DATA_SOURCE2;
 		int status = PayCompanyManagementCommon.STATUS2;
-		if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){
+		if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
 			dataSource = PayCompanyManagementCommon.DATA_SOURCE1;
 			status = PayCompanyManagementCommon.STATUS1;
 		}
@@ -288,6 +294,9 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 					if(!StringUtils.isBlank(item.getEmail())){
 						sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail()));
 					}
+					if(!StringUtils.isEmpty(item.getPhone())){
+						sendMessageDTO.setPhone(PasswordUtil.decrypt(item.getPhone()));
+					}
 					HashMap<String,String> map = new HashMap<>();
 					sendMessageDTO.setFromUser(sysUser.getUsername());
 					sendMessageDTO.setToUser(item.getUsername());
@@ -318,7 +327,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 int status = PayCompanyManagementCommon.STATUS2;
 		 // 只有财务人员操作不需要重新审核，其他人都需要审核
-		 if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){
+		 if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
 			 status = PayCompanyManagementCommon.STATUS1;
 		 }
 		 payCompanyManagement.setStatus(status);
@@ -373,7 +382,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		int status = PayCompanyManagementCommon.STATUS2;
 		// 只有财务人员操作不需要重新审核，其他人都需要审核
-		if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){
+		if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
 			status = PayCompanyManagementCommon.STATUS1;
 		}
 		payCompanyManagement.setStatus(status);
@@ -454,6 +463,10 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 	@ApiOperation(value="企业管理-批量删除", notes="企业管理-批量删除")
 	@GetMapping(value = "/deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)) {
+			return Result.error("非财务人员不可操作!");
+		}
 		if(StringUtils.isBlank(ids)){
 			return Result.error("id不能为空!");
 		}
@@ -617,7 +630,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 		// 查看角色是否为财务人员
 		int dataSource = PayCompanyManagementCommon.DATA_SOURCE2;
 		int status = PayCompanyManagementCommon.STATUS2;
-		if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){
+		if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
 			dataSource = PayCompanyManagementCommon.DATA_SOURCE1;
 			status = PayCompanyManagementCommon.STATUS1;
 		}