Merge branch 'dev-lb' into 'dev'

Dev lb

See merge request !222

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

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

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

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

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

@@ -786,7 +786,6 @@
   <select id="selectMaxPosition" resultType="java.lang.Integer">
     SELECT MAX(position)
     FROM grid_region
-    WHERE wg_parent_id = #{wgCode}
   </select>
 
 </mapper>