update

@@ -12,7 +12,7 @@
     </resultMap>
     </resultMap>
 
 
     <sql id="queryColumns">
     <sql id="queryColumns">
-        size.id, size.size_name, sort.sort_name as sortName
+        size.id, size.size_name, CONCAT(IFNULL(CONCAT(sort2.sort_name,'/'),''),sort1.sort_name) AS sortName, size.order_by
     </sql>
     </sql>
 
 
     <insert id="insertSize" parameterType="com.yoho.ufo.model.commoditybasicrole.size.Size">
     <insert id="insertSize" parameterType="com.yoho.ufo.model.commoditybasicrole.size.Size">
@@ -52,27 +52,28 @@
 
 
 
 
     <sql id="queryPage">
     <sql id="queryPage">
-        LEFT JOIN product_sort sort
-        ON size.sort_id = sort.id
+        from size
+        LEFT JOIN product_sort sort1
+        ON size.sort_id = sort1.id
+        left join product_sort sort2
+        on sort1.parent_id = sort2.id
         <where>
         <where>
             <if test="size.sortName != null and size.sortName != ''">
             <if test="size.sortName != null and size.sortName != ''">
-                sort.sort_name like concat('%', #{size.sortName}, '%')
+                sort1.sort_name like concat('%', #{size.sortName}, '%') or sort2.sort_name like concat('%', #{size.sortName}, '%')
             </if>
             </if>
             <if test="size.sizeName != null and size.sizeName !=''">
             <if test="size.sizeName != null and size.sizeName !=''">
-                size.size_name like concat('%', #{size.sizeName}, '%')
+                and size.size_name like concat('%', #{size.sizeName}, '%')
             </if>
             </if>
         </where>
         </where>
     </sql>
     </sql>
 
 
     <select id="selectSizeCount" resultType="integer">
     <select id="selectSizeCount" resultType="integer">
         select count(*)
         select count(*)
-        from size
         <include refid="queryPage"/>
         <include refid="queryPage"/>
     </select>
     </select>
 
 
     <select id="getSizePageList" resultMap="sizeMap">
     <select id="getSizePageList" resultMap="sizeMap">
         select <include refid="queryColumns"/>
         select <include refid="queryColumns"/>
-        from size
         <include refid="queryPage"/>
         <include refid="queryPage"/>
         order by size.update_time desc
         order by size.update_time desc
         limit #{page.startIndex}, #{page.pageSize}
         limit #{page.startIndex}, #{page.pageSize}

@@ -34,6 +34,10 @@ public class ProductSortServiceImpl implements IProductSortService {
      */
      */
     private static final Integer PRODUCT_SORT_LEVEL_1 = 1;
     private static final Integer PRODUCT_SORT_LEVEL_1 = 1;
 
 
+    /**
+     * 二级层级
+     */
+    private static final Integer PRODUCT_SORT_LEVEL_2 = 2;
 
 
     /**
     /**
      * 顶级id
      * 顶级id
@@ -55,6 +59,8 @@ public class ProductSortServiceImpl implements IProductSortService {
                 // 一级层级
                 // 一级层级
                 productSort.setLevel(PRODUCT_SORT_LEVEL_1);
                 productSort.setLevel(PRODUCT_SORT_LEVEL_1);
                 productSort.setParentId(TOP_PARENT_ID);
                 productSort.setParentId(TOP_PARENT_ID);
+            } else {
+                productSort.setLevel(PRODUCT_SORT_LEVEL_2);
             }
             }
             productSort.setStatus(0);
             productSort.setStatus(0);
             productSort.setCreateTime(DateUtil.currentTimeSeconds());
             productSort.setCreateTime(DateUtil.currentTimeSeconds());

@@ -102,7 +102,12 @@
                 title: "所属分类",
                 title: "所属分类",
                 field: "sortName",
                 field: "sortName",
                 width: 100,
                 width: 100,
-                align: "center",
+                align: "center"
+            }, {
+                title: "排序值",
+                field: "orderBy",
+                width: 100,
+                align: "center"
             }, {
             }, {
                 title: "操作",
                 title: "操作",
                 field: "operations",
                 field: "operations",