|
@@ -7,7 +7,6 @@ import java.util.Collection;
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
|
|
-import com.style24.persistence.TscPageRequest;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.core.env.Environment;
|
|
import org.springframework.core.env.Environment;
|
|
|
import org.springframework.core.io.InputStreamResource;
|
|
import org.springframework.core.io.InputStreamResource;
|
|
@@ -32,6 +31,7 @@ import com.style24.admin.biz.service.TsaSystemService;
|
|
|
import com.style24.admin.support.controller.TsaBaseController;
|
|
import com.style24.admin.support.controller.TsaBaseController;
|
|
|
import com.style24.admin.support.security.session.TsaSession;
|
|
import com.style24.admin.support.security.session.TsaSession;
|
|
|
import com.style24.core.support.message.TscMessageByLocale;
|
|
import com.style24.core.support.message.TscMessageByLocale;
|
|
|
|
|
+import com.style24.persistence.TscPageRequest;
|
|
|
import com.style24.persistence.domain.AdKeyword;
|
|
import com.style24.persistence.domain.AdKeyword;
|
|
|
import com.style24.persistence.domain.AdKeywordGoods;
|
|
import com.style24.persistence.domain.AdKeywordGoods;
|
|
|
import com.style24.persistence.domain.Color;
|
|
import com.style24.persistence.domain.Color;
|
|
@@ -617,7 +617,6 @@ public class TsaGoodsController extends TsaBaseController {
|
|
|
//고시정보
|
|
//고시정보
|
|
|
GoodsNotiInfo goodsNotiInfo = new GoodsNotiInfo();
|
|
GoodsNotiInfo goodsNotiInfo = new GoodsNotiInfo();
|
|
|
goodsNotiInfo.setGoodsCd(tmpGoods.getGoodsCd());
|
|
goodsNotiInfo.setGoodsCd(tmpGoods.getGoodsCd());
|
|
|
- goodsNotiInfo.setSupplyCompCd(tmpGoods.getSupplyCompCd());
|
|
|
|
|
goodsNotiInfo.setNiClsfCd(tmpGoods.getNiClsfCd());
|
|
goodsNotiInfo.setNiClsfCd(tmpGoods.getNiClsfCd());
|
|
|
Collection<GoodsNotiInfo> goodsNotiInfoList = goodsService.getGoodsNotiInfoList(goodsNotiInfo);
|
|
Collection<GoodsNotiInfo> goodsNotiInfoList = goodsService.getGoodsNotiInfoList(goodsNotiInfo);
|
|
|
if (goodsNotiInfoList == null || goodsNotiInfoList.isEmpty()) {
|
|
if (goodsNotiInfoList == null || goodsNotiInfoList.isEmpty()) {
|
|
@@ -845,7 +844,6 @@ public class TsaGoodsController extends TsaBaseController {
|
|
|
GoodsNotiInfo goodsInfo = new GoodsNotiInfo();
|
|
GoodsNotiInfo goodsInfo = new GoodsNotiInfo();
|
|
|
goodsInfo.setGoodsCd(goods.getGoodsCd());
|
|
goodsInfo.setGoodsCd(goods.getGoodsCd());
|
|
|
goodsInfo.setNiClsfCd(goods.getNiClsfCd());
|
|
goodsInfo.setNiClsfCd(goods.getNiClsfCd());
|
|
|
- goodsInfo.setSupplyCompCd(goods.getSupplyCompCd());
|
|
|
|
|
|
|
|
|
|
return goodsService.getGoodsNotiInfoList(goodsInfo);
|
|
return goodsService.getGoodsNotiInfoList(goodsInfo);
|
|
|
}
|
|
}
|