출고처연계관리 쿼리 수정

src/main/java/com/style24/admin/biz/dao/TsaBusinessDao.java

@@ -174,7 +174,7 @@ public interface TsaBusinessDao {
 	 * @author eskim
 	 * @since 2021. 01. 21
 	 */
-	Collection<SiteBrand> getBrandSupplyList(String brandCd);
+	Collection<Brand> getBrandSupplyList(String brandCd);
 
 	/**
 	 * 브랜드 등록

src/main/java/com/style24/admin/biz/service/TsaBusinessService.java

@@ -240,7 +240,7 @@ public class TsaBusinessService {
 	 * @author eskim
 	 * @since 2021. 01. 21
 	 */
-	public Collection<SiteBrand> getBrandSupplyList(String brandCd) {
+	public Collection<Brand> getBrandSupplyList(String brandCd) {
 		return businessDao.getBrandSupplyList(brandCd);
 	}
 

src/main/java/com/style24/admin/biz/web/TsaBusinessController.java

@@ -167,10 +167,12 @@ public class TsaBusinessController extends TsaBaseController {
 	@ResponseBody
 	public Collection<SupplyCompany> getSupplyCompanyList(@RequestBody SupplyCompany supplyComp) {
 		// multi row 검색관련 처리
-		if (!StringUtils.isBlank(supplyComp.getSearchSupplyCompCd()))
+		if (!StringUtils.isBlank(supplyComp.getSearchSupplyCompCd())) {
 			supplyComp.setMultiSupplyCompCd(supplyComp.getSearchSupplyCompCd().replaceAll("\r", "").split("\n"));
-		if (!StringUtils.isBlank(supplyComp.getSearchSupplyCompNm()))
+		}
+		if (!StringUtils.isBlank(supplyComp.getSearchSupplyCompNm())) {
 			supplyComp.setMultiSupplyCompNm(supplyComp.getSearchSupplyCompNm().replaceAll("\r", "").split("\n"));
+		}
 		//log.info("supplyComp  {}", supplyComp);
 		return businessService.getSupplyCompanyList(supplyComp);
 	}
@@ -318,10 +320,12 @@ public class TsaBusinessController extends TsaBaseController {
 	public Collection<Brand> getBrandList(@RequestBody Brand brand) {
 
 		// multi row 검색관련 처리
-		if (!StringUtils.isBlank(brand.getSearchBrandCd()))
+		if (!StringUtils.isBlank(brand.getSearchBrandCd())) {
 			brand.setMultiBrandCd(brand.getSearchBrandCd().replaceAll("\r", "").split("\n"));
-		if (!StringUtils.isBlank(brand.getSearchBrandNm()))
+		}
+		if (!StringUtils.isBlank(brand.getSearchBrandNm())) {
 			brand.setMultiBrandNm(brand.getSearchBrandNm().replaceAll("\r", "").split("\n"));
+		}
 
 		return businessService.getBrandList(brand);
 	}
@@ -429,7 +433,7 @@ public class TsaBusinessController extends TsaBaseController {
 	 */
 	@GetMapping("/brand/supply/list/{brandCd}")
 	@ResponseBody
-	public Collection<SiteBrand> getBrandSupplyList(@PathVariable String brandCd) {
+	public Collection<Brand> getBrandSupplyList(@PathVariable String brandCd) {
 		return businessService.getBrandSupplyList(brandCd);
 	}
 
@@ -758,10 +762,12 @@ public class TsaBusinessController extends TsaBaseController {
 	@ResponseBody
 	public Collection<BrandGroup> getBrandGroupList(@RequestBody BrandGroup brandGroup) {
 		// multi row 검색관련 처리
-		if (!StringUtils.isBlank(brandGroup.getSearchBrandGroupNo()))
+		if (!StringUtils.isBlank(brandGroup.getSearchBrandGroupNo())) {
 			brandGroup.setMultiBrandGroupNo(brandGroup.getSearchBrandGroupNo().replaceAll("\r", "").split("\n"));
-		if (!StringUtils.isBlank(brandGroup.getSearchBrandGroupNm()))
+		}
+		if (!StringUtils.isBlank(brandGroup.getSearchBrandGroupNm())) {
 			brandGroup.setMultiBrandGroupNm(brandGroup.getSearchBrandGroupNm().replaceAll("\r", "").split("\n"));
+		}
 		return businessService.getBrandGroupList(brandGroup);
 	}
 

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

@@ -825,7 +825,9 @@
 		             , B.BRAND_ENM
 		        FROM   TB_DELIVERY_LOC A
 		             , TB_BRAND B
-		        WHERE  A.SUPPLY_COMP_CD = B.SUPPLY_COMP_CD
+		             , TB_BRAND_SUPPLY C 
+		        WHERE  A.SUPPLY_COMP_CD  = C.SUPPLY_COMP_CD
+		        AND    B.BRAND_CD = C.BRAND_CD 
 		        AND    A.SUPPLY_COMP_CD = #{supplyCompCd}
 		        AND    A.DELV_LOC_CD = #{delvLocCd}
 		        AND    A.USE_YN = 'Y'