From 542b9a49e6fc0baac3c27e73a504c044d6cce460 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Sat, 22 Jan 2022 09:33:26 +0700 Subject: [PATCH] Update MapJabatanProfesiService Perbaikan untuk validasi mapping jabatan-profesi belum ada datanya --- .../com/jasamedika/medifirst2000/dao/MapJabatanProfesiDao.java | 3 ++- .../service/impl/MapJabatanProfesiServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapJabatanProfesiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapJabatanProfesiDao.java index a0e1e809..1b6ac372 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapJabatanProfesiDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapJabatanProfesiDao.java @@ -2,6 +2,7 @@ package com.jasamedika.medifirst2000.dao; import java.util.List; import java.util.Map; +import java.util.Optional; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.PagingAndSortingRepository; @@ -24,6 +25,6 @@ public interface MapJabatanProfesiDao extends PagingAndSortingRepository> findMapping(); @Query(value = "select mjp.* from sdm_mapjabatanprofesi_m mjp where mjp.jabatanfk = :jabatanId limit 1", nativeQuery = true) - MapJabatanProfesi findByJabatan(@Param("jabatanId") Integer idJabatan); + Optional findByJabatan(@Param("jabatanId") Integer idJabatan); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapJabatanProfesiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapJabatanProfesiServiceImpl.java index fdec2be4..87e2d72f 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapJabatanProfesiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapJabatanProfesiServiceImpl.java @@ -3,6 +3,7 @@ package com.jasamedika.medifirst2000.service.impl; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.orm.jpa.JpaSystemException; @@ -43,7 +44,7 @@ public class MapJabatanProfesiServiceImpl extends BaseVoServiceImpl implements M public MapJabatanProfesiVO add(MapJabatanProfesiVO vo) throws JpaSystemException, ServiceVOException { MapJabatanProfesiVO resultVO = null; - MapJabatanProfesi existedModel = mapJabatanProfesiDao.findByJabatan(vo.getJabatan().getId()); + Optional existedModel = mapJabatanProfesiDao.findByJabatan(vo.getJabatan().getId()); if (CommonUtil.isNullOrEmpty(existedModel)) { Jabatan jabatan = jabatanConverter.transferVOToModel(vo.getJabatan(), new Jabatan()); Profesi profesi = profesiConverter.transferVOToModel(vo.getProfesi(), new Profesi());