Merge branch 'master' of http://gitea.dctpay.com/hurui/youtao

cweb/src/main/java/com/hfkj/controller/GoodsController.java

@@ -55,8 +55,7 @@ public class GoodsController {
         try {
 
             List<GoodsModel> goodsList;
-            // 用户session
+
-            UserSessionObject userSession = userCenter.getSessionModel(UserSessionObject.class);
 
             // 1:淘宝 2:拼多多
             if (type == 1) {
@@ -69,6 +68,8 @@ public class GoodsController {
 
                 goodsList = goodsDataService.goodsModelTaoBaoList(jsonObject);
             } else if (type == 2) {
+                // 用户session
+                UserSessionObject userSession = userCenter.getSessionModel(UserSessionObject.class);
                 Map<String , Object> mapUser = new JSONObject();
                 mapUser.put("uid", userSession.getUser().getId());
                 JSONObject object = PddService.authority(mapUser.toString());