标准刀具分类完成

common/src/main/resources/mapper/base/Catalogues.xml

@@ -96,6 +96,9 @@ id_,title_,content_,icon_url,parent_id,sort_,del_flag,create_time,create_by,upda
 		]]>
 		<where>
 			del_flag=0
+			<if test="searchParams.id != null">
+				and id_ = #{searchParams.id}
+			</if>
 			<if test="searchParams.title != null">
 				and title_ like #{searchParams.title}
 			</if>

web/src/main/java/com/jpsoft/machinery/modules/base/controller/CommodityController.java

@@ -213,7 +213,7 @@ public class CommodityController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("create_time","asc"));
 
         if (StringUtils.isNotEmpty(cataloguesId)) {
             searchParams.put("cataloguesId",cataloguesId);

web/src/main/java/com/jpsoft/machinery/modules/open/CommodityApiController.java

@@ -31,12 +31,17 @@ public class CommodityApiController {
 
     @ApiOperation(value="商品列表")
     @RequestMapping(value = "commodityList",method = RequestMethod.POST)
-    public MessageResult<List<Map>> commodityList(){
+    public MessageResult<List<Map>> commodityList(String cataloguesId, String parentId){
         MessageResult<List<Map>> msgResult = new MessageResult<>();
 
         try {
             Map<String, Object> searchParams = new HashMap<>();
-            searchParams.put("parentId", "6b91395e-d5f5-47c2-bca2-1a79b1f1e646");
+            if(StringUtils.isNotEmpty(cataloguesId)) {
+                searchParams.put("id", cataloguesId);
+            }
+            if(StringUtils.isNotEmpty(parentId)) {
+                searchParams.put("parentId", parentId);
+            }
 
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("sort_", "asc"));