Resolved conflicts

2024-11-18 13:09:36 +05:30
parent 9635ec966c 3d107e65fb
commit 10e92babf9
23 changed files with 364 additions and 250 deletions
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/CallServiceImpl.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/CallServiceImpl.java
@@ -57,7 +57,7 @@ public class CallServiceImpl implements CallService {
    public CallResponse getCallById(HttpServletRequest request, Long callId) {
    	UserEntity user = validator.validateUser(request);
    	CallEntity call = validator.validateUserWithCall(user, callId);
-        return callDao.getCallById(call);
+        return callDao.getCallById(user,call);
    }
    
    @Override