fix:区划查询

ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.manager;
 
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysArea;
 import com.ruoyi.system.service.SysAreaService;
 import org.springframework.stereotype.Component;
@@ -26,15 +27,15 @@ public class SysAreaManager {
 
 
 
-    public List<SysArea> getSysAreaList(Long parentId) {
+    public List<SysArea> getSysAreaList(String parentId) {
         return sysAreaService.lambdaQuery()
-                .eq(SysArea::getParentId, Objects.isNull(parentId) ? 29 : parentId)
+                .eq(SysArea::getParentId, StringUtils.isEmpty(parentId) ? "29" : parentId)
                 .orderByAsc(SysArea::getAreaCode)
                 .list();
     }
 
 
-    public String getAreaName(Long id) {
+    public String getAreaName(String id) {
         return sysAreaService.lambdaQuery()
                 .eq(SysArea::getId,id).one().getName();
     }

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

@@ -30,7 +30,7 @@ public class SysAreaController {
     @ApiOperation("查询区划信息")
     @GetMapping("/getSysAreaList")
     @ResponseBody
-    public AjaxResult getSysAreaList(@RequestParam(required = false) Long parentId) {
+    public AjaxResult getSysAreaList(@RequestParam(required = false) String parentId) {
         return success(sysAreaManager.getSysAreaList(parentId));
     }
 
@@ -38,7 +38,7 @@ public class SysAreaController {
     @ApiOperation("获取区划名称")
     @GetMapping("/getAreaName")
     @ResponseBody
-    public AjaxResult getAreaName(@RequestParam Long id) {
+    public AjaxResult getAreaName(@RequestParam String id) {
         return success(sysAreaManager.getAreaName(id));
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysArea.java

@@ -12,12 +12,12 @@ public class SysArea implements Serializable {
     /**
      * 区域ID
      */
-    private Integer id;
+    private String id;
 
     /**
      * 上级区域ID
      */
-    private Integer parentId;
+    private String parentId;
 
     /**
      * 行政区域等级 1-省 2-市 3-区县 4-街道镇

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

@@ -5,8 +5,8 @@
 <mapper namespace="com.ruoyi.system.mapper.SysAreaMapper">
 
     <resultMap id="BaseResultMap" type="com.ruoyi.system.domain.SysArea">
-            <id property="id" column="id" jdbcType="INTEGER"/>
-            <result property="parentId" column="parent_id" jdbcType="INTEGER"/>
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="parentId" column="parent_id" jdbcType="VARCHAR"/>
             <result property="areaLevel" column="area_level" jdbcType="TINYINT"/>
             <result property="name" column="name" jdbcType="VARCHAR"/>
             <result property="areaCode" column="area_code" jdbcType="VARCHAR"/>