x

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

@@ -251,7 +251,7 @@ public class AddressServiceImpl implements AddressService {
 					+ "postalcode=sPostalcode, " 
 					+ "tag=nTag, "
 					+ "lastUpdateTime = dLastUpdateTime "
-				+ " from tCustAddress where nTag&1 = 0 and sCustNO = ? and (sShopNO = ? or sShopNO is null or sShopNO = '') order by nTag desc";
+				+ " 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;
@@ -269,6 +269,10 @@ public class AddressServiceImpl implements AddressService {
 				nTag_Cur = nTag;
 			}
 		}
+		
+		if(defMap == null && list.size() > 0) {
+			defMap = list.get(0);
+		}
 		return defMap;
 	}
 }