From 62be695f454680ec4d8df77faff7d6717e8dcc3c Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Tue, 28 May 2024 15:06:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=8C=BA=E5=88=92=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/manager/SysAreaManager.java   | 7 ++++---
 .../web/controller/system/system/SysAreaController.java    | 4 ++--
 .../src/main/java/com/ruoyi/system/domain/SysArea.java     | 4 ++--
 .../src/main/resources/mapper/system/SysAreaMapper.xml     | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java
index e2b7a4f..3da973b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SysAreaManager.java
+++ b/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();
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java
index 2308e65..384047e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysAreaController.java
+++ b/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));
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysArea.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysArea.java
index 60722aa..2ede96f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysArea.java
+++ b/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-街道镇
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysAreaMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysAreaMapper.xml
index acac252..bdb0209 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysAreaMapper.xml
+++ b/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"/>