updated code

src/main/java/net/gepafin/tendermanagement/service/UserService.java

@@ -38,8 +38,6 @@ public interface UserService {
     UserResponseBean updateUserStatus(Long userId, UserStatusEnum statusReq);
 
     UserResponseBean getValidUser(HttpServletRequest request);
-    
-    List<UserResponseBean> getUserByHubId(String hubId);
 
     JWTToken validateExistingUserToken(HttpServletRequest request, String token);
 
@@ -47,6 +45,6 @@ public interface UserService {
     UserEntity getUserByBeneficiaryId(Long beneficiaryId);
 
     public UserEntity getUserEntityById(Long userId);
-    List<UserResponseBean> getAllUsers(Long roleId);
+    List<UserResponseBean> getAllUsers(HttpServletRequest request, Long roleId);
 
 }

src/main/java/net/gepafin/tendermanagement/service/impl/DashboardServiceImpl.java

@@ -22,7 +22,8 @@ public class DashboardServiceImpl implements DashboardService {
 
     @Override
     public SuperAdminWidgetResponseBean getDashboardWidgetForSuperAdmin(HttpServletRequest request) {
-        return dashboardDao.getDashboardWidget();
+    	UserEntity userEntity=validator.validateUser(request);
+        return dashboardDao.getDashboardWidget(userEntity);
     }
 
     @Override

src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java

@@ -97,12 +97,6 @@ public class UserServiceImpl implements UserService {
         return userDao.getUserById(user.getId());
     }
     
-    @Override
-    @Transactional(readOnly = true)
-    public List<UserResponseBean> getUserByHubId(String hubId) {
-        return userDao.getUserByHubId(hubId);
-    }
-    
     @Override
     @Transactional(rollbackFor = Exception.class)
     public JWTToken validateExistingUserToken(HttpServletRequest request, String token) {
@@ -123,8 +117,8 @@ public class UserServiceImpl implements UserService {
     }
     @Override
     @Transactional(readOnly = true)
-    public List<UserResponseBean> getAllUsers(Long roleId) {
-        // Calling DAO Function
-        return userDao.getAllUsers(roleId);
+    public List<UserResponseBean> getAllUsers(HttpServletRequest request, Long roleId) {
+    	UserEntity user=validator.validateUser(request);
+        return userDao.getAllUsers(user, roleId);
     }
 }