修改区域公司

dev-discount
袁野 2 years ago
parent 684823d116
commit fd41cee178
  1. 5
      hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java
  2. 2
      hai-service/src/main/java/com/hai/entity/CmsCategory.java

@ -69,7 +69,7 @@ public class CmsContentController {
for (CmsCategory cmsCategory : categoryList) { for (CmsCategory cmsCategory : categoryList) {
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
// 1.小图一行四个 2.轮播图 3.消息通知 4.大图展示 5.一横图三小图 6.数据库数据 7.小图一行五个 // 1.小图一行四个 2.轮播图 3.消息通知 4.大图展示 5.一横图三小图 6.数据库数据 7.小图一行五个
if (cmsCategory.getType() == 1 || cmsCategory.getType() == 2 || cmsCategory.getType() == 4 || cmsCategory.getType() == 5|| cmsCategory.getType() == 7 ) { if (cmsCategory.getType() == 1 || cmsCategory.getType() == 2 || cmsCategory.getType() == 4 || cmsCategory.getType() == 5|| cmsCategory.getType() == 7 || cmsCategory.getType() == 8 ) {
object.put("type" , cmsCategory.getType()); object.put("type" , cmsCategory.getType());
object.put("name" , cmsCategory.getName()); object.put("name" , cmsCategory.getName());
object.put("sort" , cmsCategory.getSort()); object.put("sort" , cmsCategory.getSort());
@ -80,6 +80,9 @@ public class CmsContentController {
object.put("name" , cmsCategory.getName()); object.put("name" , cmsCategory.getName());
object.put("sort" , cmsCategory.getSort()); object.put("sort" , cmsCategory.getSort());
object.put("code" , cmsCategory.getCode()); object.put("code" , cmsCategory.getCode());
List<CmsContent> cmsContent = cmsContentService.getListCmsContentByCategoryId(cmsCategory.getId() , companyId , platform);
object.put("jumpType" , cmsContent.get(0).getJumpType());
object.put("jumpUrl" , cmsContent.get(0).getJumpUrl());
object.put("childDate" , cmsContentConfig.getCmsContentData(cmsCategory.getName() , companyId)); object.put("childDate" , cmsContentConfig.getCmsContentData(cmsCategory.getName() , companyId));
} else if(cmsCategory.getType() == 3) { } else if(cmsCategory.getType() == 3) {
object.put("type" , cmsCategory.getType()); object.put("type" , cmsCategory.getType());

@ -18,7 +18,7 @@ public class CmsCategory implements Serializable {
private Long id; private Long id;
/** /**
* 类型: // 1.小图一行四个 2.轮播图 3.消息通知 4.大图展示 5.一横图三小图 6.数据库数据 7.小图一行五个 * 类型: // 1.小图一行四个 2.轮播图 3.消息通知 4.大图展示 5.一横图三小图 6.数据库数据 7.小图一行五个 8 首页背景图
*/ */
private Integer type; private Integer type;

Loading…
Cancel
Save