chao 4 rokov pred
rodič
commit
cd4eae41ef

+ 1 - 1
src/main/java/com/caimei365/commodity/controller/ProductPageApi.java

@@ -36,7 +36,7 @@ public class ProductPageApi {
      */
      */
     @ApiOperation("获取分类菜单(旧:/product/classify)")
     @ApiOperation("获取分类菜单(旧:/product/classify)")
     @ApiImplicitParams({
     @ApiImplicitParams({
-        @ApiImplicitParam(required = true, name = "typeSort", value = "分类类型:1产品,2仪器"),
+        @ApiImplicitParam(required = true, name = "typeSort", value = "分类类型:1产品,2仪器,0全部"),
         @ApiImplicitParam(required = false, name = "source", value = "请求来源:www,crm")
         @ApiImplicitParam(required = false, name = "source", value = "请求来源:www,crm")
     })
     })
     @GetMapping("/classify")
     @GetMapping("/classify")

+ 1 - 1
src/main/java/com/caimei365/commodity/mapper/ProductTypeMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
 public interface ProductTypeMapper {
 public interface ProductTypeMapper {
     /**
     /**
      * 获取大分类
      * 获取大分类
-     * @param typeSort 分类类型:1产品,2仪器
+     * @param typeSort 分类类型:1产品,2仪器,0全部
      * @param source   请求来源:www,crm
      * @param source   请求来源:www,crm
      */
      */
     List<BigTypeVo> getBigTypeList(Integer typeSort, String source);
     List<BigTypeVo> getBigTypeList(Integer typeSort, String source);

+ 1 - 1
src/main/java/com/caimei365/commodity/service/PageService.java

@@ -18,7 +18,7 @@ public interface PageService {
     /**
     /**
      * 获取分类列表
      * 获取分类列表
      *
      *
-     * @param typeSort 分类类型:1产品,2仪器
+     * @param typeSort 分类类型:1产品,2仪器,0全部
      * @param source   请求来源:www,crm
      * @param source   请求来源:www,crm
      */
      */
     ResponseJson<List<BigTypeVo>> getClassify(Integer typeSort, String source);
     ResponseJson<List<BigTypeVo>> getClassify(Integer typeSort, String source);

+ 1 - 1
src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -50,7 +50,7 @@ public class PageServiceImpl implements PageService {
     /**
     /**
      * 获取分类列表
      * 获取分类列表
      *
      *
-     * @param typeSort 分类类型:1产品,2仪器
+     * @param typeSort 分类类型:1产品,2仪器,0全部
      * @param source   请求来源:www,crm
      * @param source   请求来源:www,crm
      */
      */
     @Override
     @Override

+ 3 - 1
src/main/resources/mapper/ProductTypeMapper.xml

@@ -6,7 +6,9 @@
             bigTypeID as bigTypeId, typeSort, `name`, bigTypeCode, wwwValidFlag, crmValidFlag, wwwIcon, crmIcon, addTime, sortIndex
             bigTypeID as bigTypeId, typeSort, `name`, bigTypeCode, wwwValidFlag, crmValidFlag, wwwIcon, crmIcon, addTime, sortIndex
         from bigtype
         from bigtype
         where
         where
-            typeSort = #{typeSort}
+            <if test="typeSort == '1' or typeSort == '2'">
+                typeSort = #{typeSort}
+            </if>
             <if test="source == 'www'.toString()">
             <if test="source == 'www'.toString()">
                 and wwwValidFlag = '1'
                 and wwwValidFlag = '1'
             </if>
             </if>