충돌 조치

This commit is contained in:
KNKIM 2021-11-15 14:34:13 +09:00
parent 858c4cd53c
commit eaa31e1cd0
2 changed files with 28 additions and 15 deletions

View File

@ -1,15 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?><!--Converted at: Wed May 11 15:49:38 KST 2016-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="nlib.col.service.impl.CollectionDAO">
<select id="selectMngOrgInfo" parameterType="String" resultType="CollectionVO">
SELECT
A.MNG_ORG_CD
, B.DEPT_NM AS MNG_ORG_NM
FROM RG_MASTER A
LEFT OUTER JOIN SM_DEPT B ON A.MNG_ORG_CD = B.ORG_CD
WHERE A.MASTER_ID = #{masterId}
</select>
<?xml version="1.0" encoding="UTF-8"?><!--Converted at: Wed May 11 15:49:38 KST 2016-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="nlib.col.service.impl.CollectionDAO">
<select id="selectMngOrgInfo" parameterType="String" resultType="CollectionVO">
SELECT
A.MNG_ORG_CD
, B.DEPT_NM AS MNG_ORG_NM
FROM RG_MASTER A
LEFT OUTER JOIN SM_DEPT B ON A.MNG_ORG_CD = B.ORG_CD
WHERE A.MASTER_ID = #{masterId}
</select>
<insert id="insertDataInquiryLog" parameterType="CollectionVO">
INSERT INTO MB_VIEW_LOG(
MNG_ORG_CD
, MASTER_ID
, MB_INFO_ID
, REG_DD
) VALUES (
#{mngOrgCd}
, #{masterId}
, #{mbInfoId}
, SYSDATE()
)
</insert>
</mapper>

View File

@ -247,7 +247,7 @@ function fn_listPops(typeDivCd) {
<li><em>생산년도</em><c:if test="${empty itemOnline.creatYyyy }">-</c:if>${itemOnline.creatYyyy }</li>
</ul>
<div class="btn-box">
<div class="view"><a href="javascript:void(0)" onclick="gfn_showDocPdf('${itemOnline.interfaceId }')">원문보기</a></div>
<div class="view"><a href="javascript:void(0)" onclick="gfn_showDocPdf('${itemOnline.interfaceId }','${itemOnline.masterId }')">원문보기</a></div>
<div class="RIS"><a href="javascript:void(0)" onclick="risShow('${itemOnline.masterId }')">RIS</a></div>
</div>
</div>