Browse Source

🔧 修改区划等级字段level为regionLevel

test
smallchill 4 years ago
parent
commit
2b28ccb95d
  1. 2
      blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Region.java
  2. 2
      blade-service/blade-system/src/main/java/org/springblade/system/excel/RegionExcel.java
  3. 4
      blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml
  4. 2
      blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java

2
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Region.java

@ -112,7 +112,7 @@ public class Region implements Serializable {
* 层级
*/
@ApiModelProperty(value = "层级")
private Integer level;
private Integer regionLevel;
/**
* 排序
*/

2
blade-service/blade-system/src/main/java/org/springblade/system/excel/RegionExcel.java

@ -79,7 +79,7 @@ public class RegionExcel implements Serializable {
private String villageName;
@ExcelProperty("层级")
private Integer level;
private Integer regionLevel;
@ExcelProperty("排序")
private Integer sort;

4
blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml

@ -18,7 +18,7 @@
<result column="town_name" property="townName"/>
<result column="village_code" property="villageCode"/>
<result column="village_name" property="villageName"/>
<result column="level" property="level"/>
<result column="level" property="regionLevel"/>
<result column="sort" property="sort"/>
<result column="remark" property="remark"/>
</resultMap>
@ -38,7 +38,7 @@
<result column="town_name" property="townName"/>
<result column="village_code" property="villageCode"/>
<result column="village_name" property="villageName"/>
<result column="level" property="level"/>
<result column="level" property="regionLevel"/>
<result column="sort" property="sort"/>
<result column="remark" property="remark"/>
<result column="id" property="id"/>

2
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java

@ -58,7 +58,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
region.setAncestors(ancestors);
}
// 设置省、市、区、镇、村
Integer level = region.getLevel();
Integer level = region.getRegionLevel();
String code = region.getCode();
String name = region.getName();
if (level == PROVINCE_LEVEL) {

Loading…
Cancel
Save