Merge branch 'dev' into 'main'

Dev

See merge request !192

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

@@ -66,13 +66,13 @@ public class RegionController extends BaseController {
                        @RequestParam("pageSize") Integer pageSize) {
         try {
             AjaxResult result = new AjaxResult();
-            SysUser user = SecurityUtils.getLoginUser().getUser();
+//            SysUser user = SecurityUtils.getLoginUser().getUser();
             //网格
             GridRegionUserExample example = new GridRegionUserExample();
             GridRegionUserExample.Criteria criteria = example.createCriteria();
-            criteria.andUserIdEqualTo(user.getUserId());
+//            criteria.andUserIdEqualTo(user.getUserId());
 
-//            criteria.andUserIdEqualTo("1");
+            criteria.andUserIdEqualTo("1");
             criteria.andIsValidEqualTo("1");
 
             List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);

ruoyi-system/src/main/java/com/ruoyi/system/service/grid/GridRegionFacadeService.java

@@ -333,6 +333,9 @@ public class GridRegionFacadeService {
                     role.setpId(twoLevel.get(0).getId());
                     role.setpName(twoLevel.get(0).getWgName());
                 }
+                if(role.getDetail()==null){
+                    role.setDetail("");
+                }
             }
         }
 //        List<GridRegionWithCompanyItem> itemList = BeanCopyUtil.bathToBean(res, GridRegionWithCompanyItem.class);

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

@@ -711,11 +711,11 @@
   </select>
   <select id="getRegionDetail" resultType="java.lang.String">
     select detail from grid_region
-    where id = #{id}
+    where wg_code = #{id}
   </select>
   <select id="getRegionJzArea" resultType="java.lang.String">
     select jz_area from grid_region
-    where id = #{id}
+    where wg_code = #{id}
   </select>
     <select id="getJzAreaByCode" resultType="java.lang.String">
       select jz_area from grid_region
@@ -729,10 +729,10 @@
       update grid_region set wg_name=#{name} where wg_code = #{code}
     </update>
   <update id="updateRegionDetail">
-    update grid_region set detail=#{detail} where id = #{id}
+    update grid_region set detail=#{detail} where wg_code = #{id}
   </update>
   <update id="updateRegionJzArea">
-    update grid_region set jz_area=#{jzArea} where id = #{id}
+    update grid_region set jz_area=#{jzArea} where wg_code = #{id}
   </update>
 
 </mapper>
\ No newline at end of file