Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/service/TsfCustomerService.java

@@ -586,10 +586,7 @@ public class TsfCustomerService {
 		customer.setSiteCd(TscConstants.Site.STYLE24.value());
 		customer.setCustId(custId);
 		String maskingCustId = customerDao.getCustomerMaxCustId(customer);
-
-		maskingCustId = MaskingUtils.id(maskingCustId);
-
-		return maskingCustId;
+		return MaskingUtils.id(maskingCustId);
 	}
 
 	/**
@@ -605,10 +602,7 @@ public class TsfCustomerService {
 		customer.setEmail(email);
 		customer.encryptData();
 		String maskingCustId = customerDao.getCustomerMaxCustId(customer);
-
-		maskingCustId = MaskingUtils.id(maskingCustId);
-
-		return maskingCustId;
+		return MaskingUtils.id(maskingCustId);
 	}
 
 	/**
@@ -623,12 +617,8 @@ public class TsfCustomerService {
 		customer.setSiteCd(TscConstants.Site.STYLE24.value());
 		customer.setCellPhnno(cellPhnno);
 		customer.encryptData();
-
 		String maskingCustId = customerDao.getCustomerMaxCustId(customer);
-
-		maskingCustId = MaskingUtils.id(maskingCustId);
-
-		return maskingCustId;
+		return MaskingUtils.id(maskingCustId);
 	}
 
 	/**
@@ -643,12 +633,8 @@ public class TsfCustomerService {
 		customer.setSiteCd(TscConstants.Site.STYLE24.value());
 		customer.setCi(ci);
 		customer.encryptData();
-
 		String maskingCustId = customerDao.getCustomerMaxCustId(customer);
-
-		maskingCustId = MaskingUtils.id(maskingCustId);
-
-		return maskingCustId;
+		return MaskingUtils.id(maskingCustId);
 	}
 
 	/**

src/main/java/com/style24/front/biz/web/TsfCustomerController.java

@@ -1023,6 +1023,7 @@ public class TsfCustomerController extends TsfBaseController {
 	public ModelAndView getPrivacyPolicyLayer(HttpServletRequest request) {
 		ModelAndView mav = new ModelAndView();
 		mav.addObject("clause", clauseService.getClause(TscConstants.Site.STYLE24.value(), "G057_11"));
+		mav.addObject("clauseList", clauseService.getClauseList(TscConstants.Site.STYLE24.value(), "G057_11"));
 		mav.addObject("mallGb", request.getParameter("mallGb"));
 		mav.setViewName(super.getDeviceViewName("customer/PrivacyPolicyLayerForm"));
 		return mav;