Merge branch 'dev-lb' into 'dev'

Dev lb

See merge request !228

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

@@ -1044,8 +1044,9 @@ public class RegionController extends BaseController {
 
     @RequestMapping(value = "/getThreeByUser", method = RequestMethod.GET)
     @ResponseBody
-    public AjaxResult getThreeByUser(@RequestParam("wgType") String wgType
-                                    ,@RequestParam("pageNum") Integer pageNum,
+    public AjaxResult getThreeByUser(@RequestParam("wgType") String wgType,
+                                     @RequestParam("wgName") String wgName,
+                                     @RequestParam("pageNum") Integer pageNum,
                                      @RequestParam("pageSize") Integer pageSize) {
         AjaxResult result = new AjaxResult();
         SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -1065,10 +1066,10 @@ public class RegionController extends BaseController {
         //3.20权限bug
         if(regions.get(0).equals("320282001")){
 //            regionList.add("320282001");
-            gridRegions = gridRegionMapper.getAllLevelThree(null,wgType);
+            gridRegions = gridRegionMapper.getAllLevelThree(null,wgType,wgName);
         }else{
             regionList.addAll(regions);
-            gridRegions = gridRegionMapper.getAllLevelThree(regionList,wgType);
+            gridRegions = gridRegionMapper.getAllLevelThree(regionList,wgType,wgName);
         }
 
         PageInfo<GridRegion> pageInfo = new PageInfo<>(gridRegions);

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

@@ -97,5 +97,5 @@ public interface GridRegionMapper {
 
     GridRegion selectByWgName(@Param("wgName") String wgName);
 
-    List<GridRegion> getAllLevelThree(@Param("wgCodeLikes")List<String> wgCodeLikes, @Param("wgType")String wgType);
+    List<GridRegion> getAllLevelThree(@Param("wgCodeLikes")List<String> wgCodeLikes, @Param("wgType")String wgType, @Param("name") String name);
 }

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

@@ -804,6 +804,9 @@
     ,
     <include refid="Blob_Column_List" />
     from grid_region where is_valid = '1'
+    <if test="name != null and name != ''">
+      and wg_name like CONCAT('%', #{name}, '%')
+    </if>
     and wg_type = #{wgType}
     <if test="wgCodeLikes != null and wgCodeLikes.size() > 0">
       and (