From f92db0e58694833cc5b7669caf6353fd407c9239 Mon Sep 17 00:00:00 2001
From: zxc <954985705@qq.com>
Date: Tue, 28 Apr 2020 13:48:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E8=AF=A6=E6=83=85roleName?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/CustomerStaffServiceImpl.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index 8f67616f69..fb865b5e68 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -182,15 +182,13 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		List<GovStaffRoleResultDTO> gridManager = staffRoleService.listStaffsInRole(UserRoleConstant.GRID_MANAGER, customerStaffGridDTOS.get(0).getPid(), DataScope.getDefault());
 		List<StaffGridListDTO> staffGridListDTOS = baseDao.selectStaffGridListByUserId(customerStaffGridDTOS);
 		for (GovStaffRoleResultDTO govStaffRoleResultDTO : gridManager) {
-			if (govStaffRoleResultDTO.getRoleKey()==UserRoleConstant.GRID_MANAGER){
+			if (govStaffRoleResultDTO.getRoleKey().equals(UserRoleConstant.GRID_MANAGER)){
 				for (StaffGridListDTO staffGridListDTO : staffGridListDTOS) {
-					if (staffGridListDTO.getStaffId()==govStaffRoleResultDTO.getStaffId()){
+					if (staffGridListDTO.getStaffId().equals(govStaffRoleResultDTO.getStaffId())){
 						staffGridListDTO.setRoleName(govStaffRoleResultDTO.getRoleName());
 					}
-					break;
 				}
 			}
-			break;
 		}
 		return new Result<List<StaffGridListDTO>>().ok(staffGridListDTOS);
 	}