Merge branch 'dev-lb' into 'dev'

fix

See merge request !221

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

@@ -191,6 +191,7 @@ public class RegionController extends BaseController {
             }else {
                 body.setStatus(level);
             }
+            body.setPosition(gridRegionMapper.selectMaxPosition(body.getWgParentId())+1);
             return gridRegionFacadeService.commit(body, "insert");
         } catch (Exception e) {
             e.printStackTrace();
@@ -1032,6 +1033,7 @@ public class RegionController extends BaseController {
             }else {
                 body.setStatus(level);
             }
+            body.setPosition(gridRegionMapper.selectMaxPosition(body.getWgParentId())+1);
             return gridRegionFacadeService.commit(body, "insert");
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -92,4 +92,6 @@ public interface GridRegionMapper {
     int updatePositionByWgCodes(@Param("wgCode") String wgCode);
 
     int countByFourthCode(String code);
+
+    int selectMaxPosition(@Param("wgCode") String wgCode);
 }
\ No newline at end of file

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

@@ -783,5 +783,10 @@
     select count(*) from house_resource
     where four = #{code} or three = #{code}
   </select>
+  <select id="selectMaxPosition" resultType="java.lang.Integer">
+    SELECT MAX(position)
+    FROM grid_region
+    WHERE wg_parent_id = #{wgCode}
+  </select>
 
 </mapper>