diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/SysAreaMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/SysAreaMapper.xml index 9490e44..cc2803d 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/SysAreaMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/SysAreaMapper.xml @@ -28,9 +28,9 @@ WITH top_area AS ( SELECT code, name, (name LIKE '%市%') AS is_municipality FROM sys_area WHERE del_flag='0' and parent_code IS NULL ) - SELECT sa.* FROM sys_area sa INNER JOIN top_area ta ON sa.code = ta.code WHERE ta.is_municipality = TRUE + SELECT sa.*,get_name_first_pinyin(sa.name) AS zm FROM sys_area sa INNER JOIN top_area ta ON sa.code = ta.code WHERE ta.is_municipality = TRUE UNION ALL - SELECT sa.* FROM sys_area sa INNER JOIN top_area ta ON sa.parent_code = ta.code WHERE ta.is_municipality = FALSE + SELECT sa.*,get_name_first_pinyin(sa.name) AS zm FROM sys_area sa INNER JOIN top_area ta ON sa.parent_code = ta.code WHERE ta.is_municipality = FALSE diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysArea.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysArea.java index 1eda81c..3eace72 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysArea.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysArea.java @@ -43,4 +43,7 @@ public class SysArea extends BaseEntity { @ApiModelProperty("父级地区编码(顶级为NULL)") private String parentCode; + @TableField(exist = false) + @ApiModelProperty("字母") + private String zm; }