Merge branch 'dev'

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -626,6 +626,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         for (CustomerStaffDTO staffDTO : customerStaffList){
             //  2.根据 customer_id 去 gov_staff_role表，查询  customer_id + role_key = root_manager ,确定 根管理员的id，即roleId
             GovStaffRoleDTO roleKey = govStaffRoleDao.getRoleByCustomerIdAndRoleKey(staffDTO.getCustomerId(), RoleKeyConstants.ROLE_KEY_ROOT_MANAGER);
+            if (null != roleKey){
 				//  3.根据roleId + staff_id(即 userId) 查 staff_role表的主键id, 如果查到了，那这个userId就是 根管理员
 				StaffRoleDTO staffRoleDTO = staffRoleDao.selectStaffRoleByStaffIdAndRoleId(staffDTO.getUserId(), roleKey.getId());
 				if (null != staffRoleDTO){
@@ -644,6 +645,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 					}
 				}
 			}
+        }
 		return new Result<List<CustomerListResultDTO>>().ok(listResultDTO);
 	}