bug修复

kmall-admin/src/main/resources/mybatis/mapper/GoodsDao.xml

@@ -301,7 +301,7 @@
             a.*
         FROM
             mall_goods a
-        where a.sku = #{goodsSn}
+        where a.is_delete=0 and a.is_on_sale=1 and a.sku = #{goodsSn}
     </select>
 
     <select id="queryList" resultType="com.kmall.admin.entity.GoodsEntity">
@@ -515,6 +515,7 @@
 			`brand`,
 			`brand_id`,
 			`category_id`,
+			 attribute_category,
 			`goods_number`,
 			`keywords`,
 			`goods_brief`,
@@ -586,6 +587,7 @@
 			#{brand},
 			#{brandId},
 			#{categoryId},
+			#{attributeCategory},
 			#{goodsNumber},
 			#{keywords},
 			#{goodsBrief},
@@ -661,6 +663,7 @@
             <if test="brand != null">`brand` = #{brand},</if>
             <if test="brandId != null">`brand_id` = #{brandId},</if>
             <if test="categoryId != null">`category_id` = #{categoryId},</if>
+            <if test="attributeCategory != null">`attribute_category` = #{attributeCategory},</if>
             <if test="goodsNumber != null">`goods_number` = #{goodsNumber},</if>
             <if test="keywords != null">`keywords` = #{keywords},</if>
             <if test="goodsBrief != null">`goods_brief` = #{goodsBrief},</if>

kmall-admin/src/main/webapp/js/shop/goods.js

@@ -3,7 +3,7 @@ $(function () {
         url: '../goods/list',
         datatype: "json",
         colModel: [
-            // {label: 'ID', name: 'id', index: 'id', width: 60, key: true},
+            {label: 'ID', name: 'id', index: 'id', width: 60, key: true},
             {label: '商户名称', name: 'merchName', index: 'merchName', width: 100, align: 'center'},
             {label: '第三方商户编号', name: 'thirdPartyMerchCode', index: 'thirdPartyMerchCode', width: 160, align: 'center'},
             // {label: '海关商品编码', name: 'cusGoodsCode', index: 'cus_goods_code', width: 180, align: 'center'},