Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/webapp/WEB-INF/manager/index.ftl

src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml

@@ -232,7 +232,7 @@
 			<if test="dictId != null"> and dict_id=#{dictId} </if>
 			<if test="categoryFlag != null and categoryFlag != ''"> and category_flag=#{categoryFlag}</if>
 			<if test="categoryPath != null and categoryPath != ''"> and category_path=#{categoryPath}</if>
-			<if test="categoryParentId != null and categoryParentId != ''"> and category_parent_id=#{categoryParentId}</if>
+			<if test="categoryParentId != null and categoryParentId != ''"> and  find_in_set(#{categoryParentId},category_parent_id)</if>
 			<if test="createBy &gt; 0"> and create_by=#{createBy} </if>
 			<if test="createDate != null"> and create_date=#{createDate} </if>
 			<if test="updateBy &gt; 0"> and update_by=#{updateBy} </if>

src/main/webapp/WEB-INF/manager/cms/content/index.ftl

@@ -62,7 +62,11 @@
 						that.treeData = [];
 					} else {
 						that.emptyText = '';
-						that.treeData = ms.util.treeData(res.data.rows, 'id', 'categoryId', 'children');
+						// 过滤掉栏目类型为链接属性
+						that.treeData = res.data.rows.filter(function (item) {
+							 return item.categoryType =='2' || item.categoryType =='1'
+						})
+						that.treeData = ms.util.treeData(that.treeData, 'id', 'categoryId', 'children');
 						that.treeData = [{
 							id: 0,
 							categoryTitle: '全部',

src/main/webapp/WEB-INF/manager/index.ftl

@@ -6,6 +6,7 @@
     <#include '/include/head-file.ftl'/>
     <script src="${base}/static/plugins/sockjs/1.4.0/sockjs.min.js"></script>
     <script src="${base}/static/plugins/stomp/2.3.3/stomp.min.js"></script>
+    <script src="https://cdn.mingsoft.net/ms/1.0/store.umd.min.js"></script>
     <style>
         .to-ele {
             font-size: 18px;
@@ -128,10 +129,7 @@
                         </el-dropdown-menu>
                     </el-dropdown>
                     <!--mstore按钮-->
-                    <div class="ms-admin-mstore-icon" @click="open(mstore)">
-                        <span v-if="mstore.syncNum>0" v-text="mstore.syncNum"></span>
-                        <i style="line-height: 42px !important;font-size: 30px;" class="iconfont icon-fenxiang2"></i>
-                    </div>
+                    <ms-store client="${client}"></ms-store>
                 </div>
 
             </el-header>
@@ -528,13 +526,6 @@
             this.list();
             //获取登录用户信息
             this.managerGet();
-            var that = this;
-            ms.http.get(ms.manager + "/store/sync.do").then(function (res) {
-                if (res.result) {
-                    res.data.syncStoreUrl += "/#/?client=${client}";
-                    that.mstore = res.data;
-                }
-            })
         },
     })
 </script>