Merge branch 'developer' into 'master'

线上权限调整

See merge request !45

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/auth/DataAuthUtils.java

@@ -74,10 +74,15 @@ public class DataAuthUtils {
                 for(int i=0; i<array.size(); i++){
                     JSONObject jsonObject = array.getJSONObject(i);
                     OnLineStore onLineStore = new OnLineStore();
-                    onLineStore.setChannel(jsonObject.getInteger("channel"));
+                    String channel = jsonObject.getString("channel");
+                    if(StringUtils.isBlank(channel)){
+                        onLineAuth.setHasAuth(false);
+                    }else {
+                        onLineStore.setChannel(Integer.valueOf(channel));
                         onLineStore.setStoreIdList(JSONArray.parseArray(jsonObject.getJSONArray("storeContent").toJSONString(), String.class));
                         list.add(onLineStore);
                     }
+                }
                 onLineAuth.setList(list);
             }
         }