Merge branch 'devs/bap-monitoring' into 'jenkins_with_weblogic'

selectCm01ComboList 데이터 조회 오류 및 송수신 파일 상세정보에 default값 설정

See merge request eapim/eapim-admin!17

src/main/java/com/eactive/eai/rms/common/combo/ibatis/IbatisComboServiceImpl.java

@@ -4,12 +4,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.eactive.eai.rms.common.combo.IbatisComboService;
+import com.eactive.eai.rms.common.datasource.DataSourceContextHolder;
+import com.eactive.eai.rms.common.datasource.DataSourceType;
+import com.eactive.eai.rms.common.datasource.DataSourceTypeManager;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.eactive.eai.rms.common.combo.IbatisComboService;
-
 @Service
 @Transactional
 @Deprecated
@@ -69,6 +72,10 @@ public class IbatisComboServiceImpl implements IbatisComboService {
 	@Deprecated
 	public List<Map<String, Object>> selectCM01ComboList(String codeColumn, String nameColumn) {
 		HashMap<String, Object> paramMap = new HashMap<>();
+		DataSourceType dataSourceType = DataSourceTypeManager.getDataSourceType(DataSourceTypeManager.APIGW);
+		DataSourceContextHolder.setDataSourceType(dataSourceType);
+		
+		paramMap.put("schemaId", dataSourceType.getSchema());
 		paramMap.put("codeColumn", codeColumn);
 		paramMap.put("nameColumn", nameColumn);
 		return ibatisComboDao.selectCM01ComboList(paramMap);

src/main/resources/com/eactive/eai/rms/bap/manage/common/Combo-oracle.xml

@@ -48,10 +48,12 @@
 	   AND $searchType$ = #param#
 		ORDER BY 1
   </statement>
+  
+  
 
   <statement id="selectCM01ComboList" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
     SELECT distinct $codeColumn$ CODE, '[' || $codeColumn$ || ']' || $nameColumn$ NAME
-      FROM AGWADM.TSEAICM01
+      FROM $schemaId$.TSEAICM01
    	<isNotEmpty prepend="WHERE" property="where">
    		$where$
 	</isNotEmpty>