fix bug

mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java

@@ -302,9 +302,12 @@ public class WxShopServiceImpl implements WxShopService {
 	        	List<WxShopVo> mShopIds = retMap.get(ms.getMerchantId());
 	        	if (null == mShopIds) {
 	        		mShopIds = new ArrayList<WxShopVo>();
+	        		retMap.put(ms.getMerchantId(), mShopIds);
+	        	}
+	        	WxShopVo shopVo = shopVoMap.get(ms.getShopId());
+	        	if (null != shopVo) {
+	        		mShopIds.add(shopVo);
 	        	}
-	        	mShopIds.add(shopVoMap.get(ms.getShopId()));
-	        	retMap.put(ms.getMerchantId(), mShopIds);
         	}
         }
         return retMap;