mb_navigate导航优化

cloud-site-api/src/main/java/com/yizhi/site/application/vo/domain/SiteDicVo.java

@@ -52,6 +52,9 @@ public class SiteDicVo {
 
 
     @ApiModelProperty(value = "修改时间")
     @ApiModelProperty(value = "修改时间")
 	private Date updateTime;
 	private Date updateTime;
+    
+    @ApiModelProperty(value = "排序")
+	private Integer sort;
 
 
 
 
     protected Serializable pkVal() {
     protected Serializable pkVal() {

cloud-site-service/src/main/java/com/yizhi/site/application/controller/api/PortalBlockController.java

@@ -34,7 +34,7 @@ public class PortalBlockController {
 
 
     public static final List<BottomMenuVO> defaultBottomMenu = Arrays.asList(
     public static final List<BottomMenuVO> defaultBottomMenu = Arrays.asList(
             new BottomMenuVO(1L,"首页",true),
             new BottomMenuVO(1L,"首页",true),
-            new BottomMenuVO(2L,"项目",true),
+            new BottomMenuVO(2L,"活动",true),
             new BottomMenuVO(3L,"课程",true),
             new BottomMenuVO(3L,"课程",true),
             new BottomMenuVO(4L,"营销",true),
             new BottomMenuVO(4L,"营销",true),
             new BottomMenuVO(6L,"社群",false),
             new BottomMenuVO(6L,"社群",false),

cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/SiteDicServiceImpl.java

@@ -39,23 +39,29 @@ public class SiteDicServiceImpl extends ServiceImpl<SiteDicMapper, SiteDic> impl
 
 
     @Override
     @Override
     public List<SiteDic> getSiteDicListByCode(String code) {
     public List<SiteDic> getSiteDicListByCode(String code) {
-    	//从新闻资讯获取栏目
-    	List<SiteDic> dics = this.baseMapper.getSiteNewsDicListByCode();
     	//从字典表中获取栏目
     	//从字典表中获取栏目
     	List<SiteDic> siteDics = this.baseMapper.getSiteDicListByCode(code);
     	List<SiteDic> siteDics = this.baseMapper.getSiteDicListByCode(code);
-    	if (CollectionUtils.isNotEmpty(dics) && CollectionUtils.isNotEmpty(siteDics)) {
-    		//重新对字典表中取出的栏目Sort，放在新闻资讯栏目后面
-    		int len = dics.size();
-    		for(SiteDic item : siteDics) {
-    			if(item.getSort() == null){
-    				item.setSort(0);
-    			}
-    			item.setSort(item.getSort() + len);
-    		}
-    		
-    		dics.addAll(siteDics);
+    	
+    	//管理端配置
+    	if(code.equals("mb_navigate")){
+    		//从新闻资讯获取栏目
+        	List<SiteDic> dics = this.baseMapper.getSiteNewsDicListByCode();
+        	if (CollectionUtils.isNotEmpty(dics) && CollectionUtils.isNotEmpty(siteDics)) {
+        		//重新对字典表中取出的栏目Sort，放在新闻资讯栏目后面
+        		int len = dics.size();
+        		for(SiteDic item : siteDics) {
+        			if(item.getSort() == null){
+        				item.setSort(0);
+        			}
+        			item.setSort(item.getSort() + len);
+        		}
+        		
+        		dics.addAll(siteDics);
+        	}
+            return dics;
     	}
     	}
-        return dics;
+    	
+    	return siteDics;
     }
     }
 
 
     @Override
     @Override

cloud-site-service/src/main/resources/mapper/SiteDicMapper.xml

@@ -32,7 +32,7 @@
         WHERE
         WHERE
         parent_id = ( SELECT ld.id FROM site_dic ld WHERE ld.`code` = #{code})
         parent_id = ( SELECT ld.id FROM site_dic ld WHERE ld.`code` = #{code})
         and status <![CDATA[ <> ]]> 0
         and status <![CDATA[ <> ]]> 0
-        <if test= "code == 'language' or code == 'mb_navigate'">
+        <if test= "code == 'language' or code == 'mb_navigate' or code == 'activity_type'">
         order by sort,name
         order by sort,name
         </if>
         </if>
         <if test= "code != 'language' and code != 'mb_navigate'">
         <if test= "code != 'language' and code != 'mb_navigate'">