java/PlayPai.git

			@@ -65,9 +65,9 @@
			try {
			List<StoreConfig> list = storeConfigService.list(new QueryWrapper<StoreConfig>().eq("storeId", storeId)
			.orderByAsc("sort").eq("isOpen", 1));
			HomeModule homeModule = homeModuleService.getOne(new QueryWrapper<HomeModule>().eq("isOpen", 1));
			List<HomeModule> homeModules = homeModuleService.list(new QueryWrapper<HomeModule>().eq("isOpen", 1).eq("storeId",storeId));
			List<StoreConfigVo> listVo = new ArrayList<>();
			if(null != homeModule){
			for (HomeModule homeModule : homeModules) {
			StoreConfigVo vo = new StoreConfigVo();
			vo.setType(0);
			vo.setIsOpen(homeModule.getIsOpen());
			@@ -75,6 +75,7 @@
			vo.setSort(homeModule.getSort());
			vo.setBackgroundImage(homeModule.getBackgroundImage());
			vo.setDisplayType(homeModule.getDisplayType());
			vo.setId(homeModule.getId());
			listVo.add(vo);
			}
			for (StoreConfig storeConfig : list) {
			@@ -115,10 +116,8 @@
			storeConfigVo.setBackgroundImage("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/0771fb3bd4de43c08492d0912209e51f.png");
			break;
			}

			}
			}

			listVo.add(storeConfigVo);
			}

			@@ -135,20 +134,18 @@
			storeConfigVo.setSort(worldCupStore.getSort());
			listVo.add(storeConfigVo);
			}


			//排序
			Collections.sort(listVo, new Comparator<StoreConfigVo>() {
			@Override
			public int compare(StoreConfigVo o1, StoreConfigVo o2) {
			return o1.getSort().compareTo(o2.getSort());
			return Comparator.nullsLast(Integer::compareTo).compare(o1.getSort(), o2.getSort());
			}
			});
			//排序
			Collections.sort(listVo, new Comparator<StoreConfigVo>() {
			@Override
			public int compare(StoreConfigVo o1, StoreConfigVo o2) {
			return o1.getIsTop().compareTo(o2.getIsTop()) * -1;
			return Comparator.nullsLast(Integer::compareTo).compare(o2.getIsTop(), o1.getIsTop());
			}
			});
			for (int i = 0; i < listVo.size(); i++) {