新增：park字段

src/main/java/com/gxwebsoft/cms/controller/CmsNavigationController.java

@@ -1,6 +1,7 @@
 package com.gxwebsoft.cms.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.gxwebsoft.cms.entity.CmsDesign;
 import com.gxwebsoft.cms.mapper.CmsNavigationMapper;
@@ -37,8 +38,6 @@ public class CmsNavigationController extends BaseController {
     @Resource
     private CmsNavigationService cmsNavigationService;
     @Resource
-    private CmsNavigationMapper cmsNavigationMapper;
-    @Resource
     private CmsDesignService cmsDesignService;
 
     @ApiOperation("分页查询网站导航记录表")
@@ -130,28 +129,30 @@ public class CmsNavigationController extends BaseController {
       return success(CommonUtil.toTreeData(navigations, 0, CmsNavigation::getParentId, CmsNavigation::getNavigationId, CmsNavigation::setChildren));
     }
 
-//    @ApiOperation("根据path获取导航")
+    @ApiOperation("根据path获取导航")
-//    @GetMapping("/getCmsNavigationByPath")
+    @GetMapping("/getNavigationByPath")
-//    public ApiResult<CmsNavigation> getCmsNavigationByPath(CmsNavigationParam param) {
+    public ApiResult<CmsNavigation> getNavigationByPath(CmsNavigationParam param) {
-//      final List<CmsNavigation> navigations = cmsNavigationService.listRel(param);
+      final CmsNavigation one = cmsNavigationService.getOne(new LambdaUpdateWrapper<CmsNavigation>().eq(CmsNavigation::getPath, param.getPath()).last("limit 1"));
-//      final CmsNavigation one = cmsNavigationService.getOne(new LambdaUpdateWrapper<CmsNavigation>().eq(CmsNavigation::getPath, param.getPath()).last("limit 1"));
+
-//      System.out.println("one = " + one);
+      System.out.println("one = " + one);
-//      // 页面元素
+      final CmsNavigation navigation = cmsNavigationService.getOne(new LambdaQueryWrapper<CmsNavigation>().eq(CmsNavigation::getPath, param.getPath()).last("limit 1"));
-//      final CmsDesign design = cmsDesignService.getOne(new LambdaUpdateWrapper<CmsDesign>().eq(CmsDesign::getCategoryId,one.getNavigationId()).last("limit 1"));
+      System.out.println("navigation = " + navigation);
-//      System.out.println("design = " + design);
+      // 页面元素
-//      // 上级导航
+      final CmsDesign design = cmsDesignService.getOne(new LambdaUpdateWrapper<CmsDesign>().eq(CmsDesign::getCategoryId,one.getNavigationId()).last("limit 1"));
-//      if (!navigation.getParentId().equals(0)) {
+      System.out.println("design = " + design);
-//        final CmsNavigation parent = cmsNavigationService.getById(navigation.getParentId());
+      // 上级导航
-//        navigation.setParentPath(parent.getPath());
+      if (!navigation.getParentId().equals(0)) {
-//        navigation.setParentName(parent.getTitle());
+        final CmsNavigation parent = cmsNavigationService.getById(navigation.getParentId());
-//      }
+        navigation.setParentPath(parent.getPath());
-//      // 页面信息
+        navigation.setParentName(parent.getTitle());
-//      navigation.setDesign(design);
+      }
-//      // 页面布局
+      // 页面信息
-//      if (ObjectUtil.isNotEmpty(design)) {
+      navigation.setDesign(design);
-//        navigation.setLayout(design.getLayout());
+      // 页面布局
-//      }
+      if (ObjectUtil.isNotEmpty(design)) {
-//      return success(navigation);
+        navigation.setLayout(design.getLayout());
-//    }
+      }
+      return success(navigation);
+    }
 
 }

src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java

@@ -77,7 +77,8 @@ public class MybatisPlusConfig {
           "cms_website",
           "cms_domain",
           "cms_website_field",
-          "cms_navigation"
+          "cms_navigation",
+          "cms_design"
         ).contains(tableName);
       }
     };

src/main/java/com/gxwebsoft/common/system/controller/UserGradeController.java

@@ -29,8 +29,6 @@ public class UserGradeController extends BaseController {
     @Resource
     private UserGradeService userGradeService;
 
-    @PreAuthorize("hasAuthority('sys:userGrade:list')")
-    @OperationLog
     @ApiOperation("分页查询用户会员等级表")
     @GetMapping("/page")
     public ApiResult<PageResult<UserGrade>> page(UserGradeParam param) {
@@ -38,8 +36,6 @@ public class UserGradeController extends BaseController {
         return success(userGradeService.pageRel(param));
     }
 
-    @PreAuthorize("hasAuthority('sys:userGrade:list')")
-    @OperationLog
     @ApiOperation("查询全部用户会员等级表")
     @GetMapping()
     public ApiResult<List<UserGrade>> list(UserGradeParam param) {
@@ -47,8 +43,6 @@ public class UserGradeController extends BaseController {
         return success(userGradeService.listRel(param));
     }
 
-    @PreAuthorize("hasAuthority('sys:userGrade:list')")
-    @OperationLog
     @ApiOperation("根据id查询用户会员等级表")
     @GetMapping("/{id}")
     public ApiResult<UserGrade> get(@PathVariable("id") Integer id) {

src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml

@@ -56,6 +56,9 @@
             <if test="param.zipCode != null">
               AND a.zip_code = #{param.zipCode}
             </if>
+            <if test="param.park != null">
+              AND a.park = #{param.park}
+            </if>
             <if test="param.leaderId != null">
                 AND a.leader_id = #{param.leaderId}
             </if>

src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java

@@ -59,6 +59,10 @@ public class OrganizationParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private String zipCode;
 
+    @ApiModelProperty(value = "所属园区")
+    @QueryField(type = QueryType.EQ)
+    private String park;
+
     @ApiModelProperty(value = "负责人id")
     @QueryField(type = QueryType.EQ)
     private Integer leaderId;