Merge remote-tracking branch 'origin/dev_govgrid' into dev

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);
 	}