fix

ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java

@@ -25,6 +25,7 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -716,9 +717,30 @@ public class RegionController extends BaseController {
         if(!StringUtils.isBlank(wgCode)){
             wgCodeLikes = Arrays.asList(wgCode.split(","));
         }
-
-        List<GridRegion> gridRegionList = gridRegionMapper.getThirdRegion(wgType,wgCodeLikes,name);
-        return AjaxResult.success(gridRegionList);
+        List<GridTreeNode> treeNodeList = new ArrayList<>();
+        List<GridRegion> gridRegionList = gridRegionMapper.getSecondOrThirdRegion(wgType,wgCodeLikes,null,"2");
+        for(GridRegion gridRegion : gridRegionList){
+            List<String> parent = new ArrayList<>();
+            parent.add(gridRegion.getWgCode());
+            List<GridRegion> children = gridRegionMapper.getSecondOrThirdRegion(wgType,parent,name,"3");
+            GridTreeNode treeNode = new GridTreeNode();
+            BeanUtils.copyProperties(gridRegion,treeNode);
+            treeNode.setName(gridRegion.getWgName());
+            treeNode.setId(gridRegion.getId());
+            treeNode.setCode(gridRegion.getWgCode());
+            treeNode.setParentId(gridRegion.getWgParentId());
+            for(GridRegion child : children){
+                GridTreeNode childTreeNode = new GridTreeNode();
+                BeanUtils.copyProperties(child,childTreeNode);
+                childTreeNode.setName(child.getWgName());
+                childTreeNode.setId(child.getId());
+                childTreeNode.setCode(child.getWgCode());
+                childTreeNode.setParentId(child.getWgParentId());
+                treeNode.getChild().add(childTreeNode);
+            }
+            treeNodeList.add(treeNode);
+        }
+        return AjaxResult.success(treeNodeList);
     }
 
     @RequestMapping(value = "/getOneOrTwoRegion",method = RequestMethod.GET)

ruoyi-system/src/main/java/com/ruoyi/system/mapper/grid/GridRegionMapper.java

@@ -46,5 +46,5 @@ public interface GridRegionMapper {
 
     Integer countByParams(GridRegionSearchParam param);
 
-    List<GridRegion> getThirdRegion(@Param("wgType")String wgType,@Param("wgCodeLikes")List<String> wgCodeLikes,@Param("name")String name);
+    List<GridRegion> getSecondOrThirdRegion(@Param("wgType")String wgType, @Param("wgCodeLikes")List<String> wgCodeLikes, @Param("name")String name, @Param("level")String level);
 }
\ No newline at end of file

ruoyi-system/src/main/resources/mapper/grid/GridRegionMapper.xml

@@ -612,7 +612,7 @@
       and level = #{level}
     </if>
   </select>
-    <select id="getThirdRegion" resultType="com.ruoyi.system.domain.grid.GridRegion">
+    <select id="getSecondOrThirdRegion" resultType="com.ruoyi.system.domain.grid.GridRegion">
       select
       <include refid="Base_Column_List" />
       from grid_region where is_valid = '1'
@@ -622,6 +622,8 @@
           wg_code like CONCAT(#{wgCode}, '%')
         </foreach>
         )
+      </if>
+      <if test="level !=2">
         and (
         <foreach collection="wgCodeLikes" item="wgCode" open="(" close=")" separator="and">
           wg_code != #{wgCode}
@@ -634,6 +636,6 @@
       <if test="name != null and name != ''">
         and wg_name = #{name}
       </if>
-      and level = 3
+      and level = #{level}
     </select>
 </mapper>
\ No newline at end of file