Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.scm into develop

src/main/java/com/style24/persistence/domain/GoodsSafeNo.java

@@ -19,6 +19,7 @@ public class GoodsSafeNo extends TscBaseDomain {
 	private String certNum;
 	private String certState;
 	private String certDiv;
+	private String certOrganName;
 	private String certDt;
 
 }

src/main/java/com/style24/persistence/domain/GoodsSearch.java

@@ -2,8 +2,8 @@ package com.style24.persistence.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.style24.persistence.TscBaseDomain;
-
 import com.style24.persistence.TscPageRequest;
+
 import lombok.Data;
 
 /**
@@ -80,6 +80,7 @@ public class GoodsSearch extends TscBaseDomain {
 	private String alarmYn;
 	private String useYn;
 	private String noticeTitle;
+	private String roleCd;
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] siteCd;

src/main/java/com/style24/persistence/mybatis/shop/TssGoods.xml

@@ -398,6 +398,12 @@
 		            WHERE  CATE_CD = #{cateCd}
 		        )
 		        </if>
+		        <if test='roleCd != null and roleCd == "G001_B000" '>
+		        AND G.SELF_GOODS_YN = 'N'    -- 입점상품
+		        </if>
+		        <if test='roleCd != null and roleCd == "G001_E000" '>
+		        AND G.SELF_GOODS_YN = 'Y'     -- 자사상품
+		        </if>
 	</sql>
 	
 	<!-- 목록 페이징 정보 -->
@@ -588,6 +594,7 @@
 		     , FN_GET_USER_NM(G.UPD_NO) AS UPD_NM
 		     , E.CERT_NUM
 		     , E.CERT_DT
+		     , E.CERT_ORGAN_NAME
 		     , DATE_FORMAT(G.SELL_STDT, '%Y%m%d%H%i%S') AS SELL_STDT
 		     , DATE_FORMAT(G.SELL_EDDT, '%Y%m%d%H%i%S') AS SELL_EDDT
 		FROM TB_GOODS G
@@ -2598,6 +2605,7 @@
 		    GOODS_CD
 		  , CERT_NUM
 		  , CERT_DIV
+		  , CERT_ORGAN_NAME
 		  , CERT_STATE
 		  , CERT_DT
 		  , REG_NO
@@ -2609,6 +2617,7 @@
 		    #{goodsCd}
 		  , #{certNum}
 		  , #{certDiv}
+		  , #{certOrganName}A
 		  , #{certState}
 		  , #{certDt}
 		  , #{regNo}
@@ -2619,6 +2628,7 @@
 		ON DUPLICATE KEY UPDATE
 		       CERT_NUM = #{certNum}
 		     , CERT_DIV = #{certDiv}
+		     , CERT_ORGAN_NAME = #{certOrganName}
 		     , CERT_STATE = #{certState}
 		     , CERT_DT = #{certDt}
 		     , UPD_NO = #{updNo}

src/main/java/com/style24/scm/biz/service/TssGoodsService.java

@@ -111,6 +111,7 @@ public class TssGoodsService {
 	 * @since 2020. 10. 20
 	 */
 	public int getGoodsListCount(GoodsSearch goodsSearch) {
+		goodsSearch.setRoleCd(TssSession.getInfo().getRoleCd());
 		return goodsDao.getGoodsListCount(goodsSearch);
 	}
 
@@ -123,6 +124,7 @@ public class TssGoodsService {
 	 * @since 2020. 10. 20
 	 */
 	public Collection<Goods> getGoodsList(GoodsSearch goodsSearch) {
+		goodsSearch.setRoleCd(TssSession.getInfo().getRoleCd());
 		return goodsDao.getGoodsList(goodsSearch);
 	}
 
@@ -3425,6 +3427,7 @@ public class TssGoodsService {
 						goodsSafeNo.setCertNum(result.get("certNum").toString());
 						goodsSafeNo.setCertState(result.get("certState").toString());
 						goodsSafeNo.setCertDiv(result.get("certDiv").toString());
+						goodsSafeNo.setCertOrganName(result.get("certOrganName").toString());
 						goodsSafeNo.setRegNo(TssSession.getInfo().getUserNo());
 						goodsSafeNo.setUpdNo(TssSession.getInfo().getUserNo());
 						goodsDao.saveGoodsSafeNo(goodsSafeNo);