x

src/main/java/com/egolm/shop/api/service/impl/AddressServiceImpl.java

@@ -254,18 +254,22 @@ public class AddressServiceImpl implements AddressService {
 				+ " from tCustAddress where nTag&1 = 0 and sCustNO = ? and (sShopNO = ? or sShopNO is null or sShopNO = '') order by nTag desc, dLastUpdateTime desc";
 		List<Map<String, Object>> list = jdbcTemplate.queryForList(sql, custNo, shopNo);
 		Map<String, Object> defMap = null;
+		Integer nTag_Cur = 0;
 		for(Map<String, Object> map : list) {
 			Integer nTag = (Integer)map.get("nTag");
 			if(nTag != null) {
 				if((nTag&6) == 6) {
 					defMap = map;
+					break;
 				} else if((nTag&2) == 2) {
 					defMap = map;
-				} else if((nTag&4) == 4) {
+				} else if((nTag&4) == 4 && (nTag_Cur&2) == 0) {
 					defMap = map;
 				}
+				nTag_Cur = nTag;
 			}
 		}
+		
 		if(defMap == null && list.size() > 0) {
 			defMap = list.get(0);
 		}