충돌 수정

이민희

2021-12-02 6a72a3edec87cca9996c7ab3be3fd48479881945

 src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java

@@ -1064,6 +1064,30 @@
        resJsonData.put(Constants.RES_KEY_CONTENTS, userVo);
    }

    //  마지막으로 선택한 이슈 타입 정보를 저장한다.
    @Override
    @Transactional
    public void updateLastIssueType(Map<String, Object> resJsonData, UserForm userForm) {
        User user = this.getUser(this.webAppUtil.getLoginId());

        if (userForm.getLastIssueTypeId() != null) {
            user.setLastIssueTypeId(userForm.getLastIssueTypeId());
        }

        this.userRepository.saveAndFlush(user);
        //  세션 업데이트
        SecurityUtils.setUserToSession(user);
        //  클라이언트의 사용자 정보 업데이트
        UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class, "password");

        if (user.getSocialType() != null) {
            userVo.setSocialType(user.getSocialType().toString());
        }

        userVo.setAccount(CommonUtil.decryptAES128(userVo.getAccount()));

        resJsonData.put(Constants.RES_KEY_CONTENTS, userVo);
    }
    //  특정 아이디에 해당하는 사용자 목록을 가져온다.
    @Override
    @Transactional(readOnly = true)
@@ -1237,6 +1261,22 @@
        return results;
    }

    //  이메일 알림 예정 시간을 실시간으로 설정한 사용자를 조회한다.
    @Override
    @Transactional(readOnly = true)
    public List<String> findByRealTimeNotifyTime() {
        Map<String, Object> conditions = new HashMap<>();

        List<Map<String, Object>> users = this.userMapper.findByRealTimeNotifyTime(conditions);
        List<String> results = Lists.newArrayList();

        for (Map<String, Object> user : users) {
            results.add(MapUtil.getString(user, "account"));
        }

        return results;
    }

    //  프로젝트에 참여하는 사용자 정보를 조회한다.
    @Override
    @Transactional(readOnly = true)