From 793115e2e7e65e0109e2522ab4dc739aac042e46 Mon Sep 17 00:00:00 2001
From: zhuoda <zhuoluodada@qq.com>
Date: Tue, 13 Jun 2023 20:33:33 +0800
Subject: [PATCH] update

---
 .../module/business/goods/controller/GoodsController.java | 2 +-
 .../layout/components/side-expand-menu/recursion-menu.vue | 8 ++++----
 .../src/layout/components/side-expand-menu/sub-menu.vue   | 8 ++++----
 .../src/store/modules/system/role.js                      | 2 +-
 .../src/store/modules/system/user.js                      | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java
index b1a31ccf..7fa863c2 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java
@@ -38,7 +38,7 @@ public class GoodsController extends AdminBaseController {
 
     @ApiOperation("分页查询 @author 胡克")
     @PostMapping("/goods/query")
-    @PreAuthorize("@saAuth.checkPermission('goods:query ')")
+    @PreAuthorize("@saAuth.checkPermission('goods:query')")
     public ResponseDTO<PageResult<GoodsVO>> query(@RequestBody @Valid GoodsQueryForm queryForm) {
         return goodsService.query(queryForm);
     }
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/recursion-menu.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/recursion-menu.vue
index c8cfaa3f..271ea455 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/recursion-menu.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/recursion-menu.vue
@@ -11,11 +11,11 @@
   <div class="resursion-container">
     <!-- 顶部顶级菜单名称 -->
     <div class="top-menu">
-      <span class="ant-menu">{{ props.selectedMenu?.menuName }}</span>
+      <span class="ant-menu">{{ props.selectedMenu.menuName }}</span>
     </div>
     <!-- 次级菜单展示 -->
     <a-menu :selectedKeys="selectedKeys" :openKeys="openKeys" mode="inline">
-      <template v-for="item in props.selectedMenu?.children" :key="item.menuId">
+      <template v-for="item in props.selectedMenu.children" :key="item.menuId">
         <template v-if="item.visibleFlag">
           <template v-if="$lodash.isEmpty(item.children)">
             <a-menu-item :key="item.menuId.toString()" @click="turnToPage(item)">
@@ -60,14 +60,14 @@
       return [];
     }
     let menuParentIdListMap = useUserStore().getMenuParentIdListMap;
-    return menuParentIdListMap?.get(currentName) || [];
+    return menuParentIdListMap.get(currentName) || [];
   });
 
   const openKeys = computed(() => {
     // // 仅展开当前页面
     // return parentMenuList.value.map((e) => e.name);
     // 展开所有
-    let children = props.selectedMenu?.children;
+    let children = props.selectedMenu.children;
     if (!children || _.isEmpty(children)) {
       return [];
     }
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/sub-menu.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/sub-menu.vue
index 3dd193bc..ac44ab62 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/sub-menu.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/sub-menu.vue
@@ -8,12 +8,12 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-sub-menu :key="props.menuInfo?.menuId.toString()">
+  <a-sub-menu :key="props.menuInfo.menuId.toString()">
     <template #icon>
-      <component :is="$antIcons[props.menuInfo?.icon]" />
+      <component :is="$antIcons[props.menuInfo.icon]" />
     </template>
-    <template #title>{{ props.menuInfo?.menuName }}</template>
-    <template v-for="item in props.menuInfo?.children" :key="item.menuId">
+    <template #title>{{ props.menuInfo.menuName }}</template>
+    <template v-for="item in props.menuInfo.children" :key="item.menuId">
       <template v-if="item.visibleFlag">
         <template v-if="!item.children">
           <a-menu-item :key="item.menuId.toString()" @click="turnToPage(item)">
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/role.js b/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/role.js
index 4b9c0e3a..f487be56 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/role.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/role.js
@@ -82,7 +82,7 @@ export const useRoleStore = defineStore({
         return;
       }
       // 选中父级
-      let parentIndex = this.checkedData.findIndex((e) => parentModule?.menuId === e);
+      let parentIndex = this.checkedData.findIndex((e) => parentModule.menuId === e);
       if (parentModule.menuId && parentIndex == -1) {
         this.addCheckedData(parentModule.menuId);
       }
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/user.js b/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/user.js
index a2ec9893..578dba0f 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/user.js
+++ b/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/user.js
@@ -240,7 +240,7 @@ export const useUserStore = defineStore({
     },
     // 清空缓存
     clearKeepAliveIncludes(val) {
-      if (!val || !this.keepAliveIncludes?.includes(val)) {
+      if (!val || !this.keepAliveIncludes.includes(val)) {
         this.keepAliveIncludes = [];
         return;
       }