Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -82,6 +82,22 @@ public class SysDictDataController extends BaseController
         return AjaxResult.success(data);
     }
 
+    /**
+     * 根据字典类型查询字典数据信息
+     */
+    @PostMapping(value = "/all-by-types")
+    public AjaxResult allByTypes(@RequestBody List<String> dictTypes)
+    {
+        SysDictData query = new SysDictData();
+        query.getParams().put("dictTypes", dictTypes);
+        List<SysDictData> data = dictDataService.selectDictDataList(query);
+        if (StringUtils.isNull(data))
+        {
+            data = new ArrayList<>();
+        }
+        return AjaxResult.success(data);
+    }
+
     /**
      * 新增字典类型
      */

ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductCategoryController.java

@@ -45,9 +45,9 @@ public class ProductCategoryController extends BaseController {
     @ApiOperation("查询商品分类列表")
     @PreAuthorize("@ss.hasPermi('pms:productCategory:list')")
     @PostMapping("/list")
-    public ResponseEntity<Page<ProductCategory>> list(@RequestBody ProductCategoryQuery query, Pageable page) {
-        List<ProductCategory> list = service.selectList(query, page);
-        return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
+    public ResponseEntity<List<ProductCategory>> list(@RequestBody ProductCategoryQuery query) {
+        List<ProductCategory> list = service.selectList(query, null);
+        return ResponseEntity.ok(list);
     }
 
     @ApiOperation("导出商品分类列表")

ruoyi-mall/src/main/java/com/cyl/pms/domain/ProductCategory.java

@@ -20,8 +20,8 @@ public class ProductCategory extends BaseAudit {
     @ApiModelProperty("ID")
     private Long id;
 
-    @ApiModelProperty("上机分类的编号：0表示一级分类")
-    @Excel(name = "上机分类的编号：0表示一级分类")
+    @ApiModelProperty("上级分类的编号：0表示一级分类")
+    @Excel(name = "上级分类的编号：0表示一级分类")
     private Long parentId;
 
     @ApiModelProperty("NAME")

ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/ProductCategoryQuery.java

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(description="商品分类 查询 对象")
 @Data
 public class ProductCategoryQuery {
-    @ApiModelProperty("上机分类的编号：0表示一级分类 精确匹配")
+    @ApiModelProperty("上级分类的编号：0表示一级分类 精确匹配")
     private Long parentId;
 
     @ApiModelProperty("NAME 精确匹配")

ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/ProductCategoryVO.java

@@ -13,8 +13,8 @@ import lombok.Data;
 public class ProductCategoryVO extends BaseAudit {
    /** ID */
     private Long id;
-   /** 上机分类的编号：0表示一级分类 */
-    @Excel(name = "上机分类的编号：0表示一级分类")
+   /** 上级分类的编号：0表示一级分类 */
+    @Excel(name = "上级分类的编号：0表示一级分类")
     private Long parentId;
    /** NAME */
     @Excel(name = "NAME")

ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -37,6 +37,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null and status != ''">
 				AND status = #{status}
 			</if>
+			<if test="params != null and params.dictTypes != null and params.dictTypes.size() > 0">
+				AND dict_type in
+				<foreach collection="params.dictTypes" open="(" separator="," close=")" item="it">
+					#{it}
+				</foreach>
+			</if>
 		</where>
 		order by dict_sort asc
 	</select>

sql/mall_pms结构.sql

@@ -53,7 +53,7 @@ DROP TABLE IF EXISTS `pms_product_category`;
 CREATE TABLE `pms_product_category`
 (
     `id`            bigint(20) NOT NULL AUTO_INCREMENT,
-    `parent_id`     bigint(20) NULL DEFAULT NULL COMMENT '上机分类的编号：0表示一级分类',
+    `parent_id`     bigint(20) NULL DEFAULT NULL COMMENT '上级分类的编号：0表示一级分类',
     `name`          varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
     `level`         int(1) NULL DEFAULT NULL COMMENT '分类级别：0->1级；1->2级',
     `show_status`   int(1) NULL DEFAULT NULL COMMENT '显示状态：0->不显示；1->显示',