fix

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

@@ -326,11 +326,13 @@ public class WxShopServiceImpl implements WxShopService {
         			}
         			Long shopId = (Long)shop.get("id");
         			if (null != shopId) {
-        				WxShopUsers su = shopUserMap.get(shopId);
-        				if (null != su) {
-        					shop.put("shopUserType", su.getType());
-        					shop.put("shopUserTypeName", su.getTypeName());
-        					shop.put("shopUserName", su.getName());
+        				if (null != shopUserMap) {
+	        				WxShopUsers su = shopUserMap.get(shopId);
+	        				if (null != su) {
+	        					shop.put("shopUserType", su.getType());
+	        					shop.put("shopUserTypeName", su.getTypeName());
+	        					shop.put("shopUserName", su.getName());
+	        				}
         				}
         				
         				Long merchantId = shopMerchantIdMap.get(shopId);