From 756ca307aa681887f4b7bde376065e1840c64183 Mon Sep 17 00:00:00 2001
From: wangshaoping <wspsc@163.com>
Date: Wed, 5 Jun 2024 09:36:32 +0800
Subject: [PATCH] update

---
 .../src/views/application/Application.vue     |  5 +---
 .../src/views/shared/SelectMenuTreeGrid.vue   |  7 ++---
 .../jpa/repository/ApplicationRepository.java |  2 ++
 .../service/impl/ApplicationServiceImpl.java  | 10 +++++--
 .../menu/service/impl/MenuServiceImpl.java    | 30 +++++++++----------
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/io.sc.platform.system.frontend/src/views/application/Application.vue b/io.sc.platform.system.frontend/src/views/application/Application.vue
index c230713a..7a3f3bb8 100644
--- a/io.sc.platform.system.frontend/src/views/application/Application.vue
+++ b/io.sc.platform.system.frontend/src/views/application/Application.vue
@@ -65,14 +65,12 @@
             (evt, row, index) => {
               currentSelectedApplicationId = row.id;
               menuTreeGridRef?.refresh();
-              userGridRef?.refresh();
             }
           "
           @before-request-data="
             () => {
               currentSelectedApplicationId = '';
               menuTreeGridRef?.refresh();
-              userGridRef?.refresh();
             }
           "
         >
@@ -102,11 +100,10 @@
 </template>
 <script setup lang="ts">
 import { ref } from 'vue';
-import { Environment, axios, EnumTools, Options, Formater } from 'platform-core';
+import { Environment, axios, Options, Formater } from 'platform-core';
 import SelectMenuTreeGrid from '../shared/SelectMenuTreeGrid.vue';
 
 const applicationGridRef = ref();
-const userGridRef = ref();
 const menuTreeGridRef = ref();
 
 const selectedTabRef = ref('menu');
diff --git a/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue b/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue
index fa9febbe..22814797 100644
--- a/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue
+++ b/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue
@@ -20,6 +20,7 @@
       }
     "
     :fetch-data-url="fetchDataUrl + '?' + foreignKey + '=' + foreignValue"
+    :auto-fetch-data="false"
     :pageable="false"
     :toolbar-configure="{ noIcon: true }"
     :toolbar-actions="[
@@ -94,7 +95,7 @@
   ></w-grid>
 </template>
 <script setup lang="ts">
-import { ref, onUpdated } from 'vue';
+import { ref } from 'vue';
 import { DialogManager, Formater, Tools } from 'platform-core';
 
 const props = defineProps({
@@ -113,10 +114,6 @@ const refresh = () => {
   treeGridRef.value.refresh();
 };
 
-onUpdated(() => {
-  treeGridRef.value.refresh();
-});
-
 defineExpose({
   refresh,
 });
diff --git a/io.sc.platform.system/src/main/java/io/sc/platform/system/application/jpa/repository/ApplicationRepository.java b/io.sc.platform.system/src/main/java/io/sc/platform/system/application/jpa/repository/ApplicationRepository.java
index f8cc9aa5..dc7c7b6b 100644
--- a/io.sc.platform.system/src/main/java/io/sc/platform/system/application/jpa/repository/ApplicationRepository.java
+++ b/io.sc.platform.system/src/main/java/io/sc/platform/system/application/jpa/repository/ApplicationRepository.java
@@ -10,6 +10,8 @@ import java.util.List;
 public interface ApplicationRepository extends DaoRepository<ApplicationEntity,String> {
     @Query("select max(e.order)+1 from io.sc.platform.system.application.jpa.entity.ApplicationEntity e")
     public Integer getNextOrder();
+
     public ApplicationEntity findByCode(String code);
+
     public List<ApplicationEntity> findAllByOrderByName();
 }
diff --git a/io.sc.platform.system/src/main/java/io/sc/platform/system/application/service/impl/ApplicationServiceImpl.java b/io.sc.platform.system/src/main/java/io/sc/platform/system/application/service/impl/ApplicationServiceImpl.java
index ba378169..3a6a4dee 100644
--- a/io.sc.platform.system/src/main/java/io/sc/platform/system/application/service/impl/ApplicationServiceImpl.java
+++ b/io.sc.platform.system/src/main/java/io/sc/platform/system/application/service/impl/ApplicationServiceImpl.java
@@ -134,13 +134,17 @@ public class ApplicationServiceImpl extends DaoServiceImpl<ApplicationEntity, St
     @Override
     @Transactional
     public void removeAllMenus(String applicationId) throws Exception {
-        jdbcTemplate.update("delete from SYS_APPLICATION_MENU where APPLICATION_ID_=?", applicationId);
+        if(StringUtils.hasText(applicationId)) {
+            jdbcTemplate.update("delete from SYS_APPLICATION_MENU where APPLICATION_ID_=?", applicationId);
+        }
     }
 
     @Override
     @Transactional
     public void updateMenus(String applicationId, Set<String> menuIds) throws Exception {
-        removeAllMenus(applicationId);
-        addMenus(applicationId,menuIds);
+        if(StringUtils.hasText(applicationId)) {
+            removeAllMenus(applicationId);
+            addMenus(applicationId, menuIds);
+        }
     }
 }
diff --git a/io.sc.platform.system/src/main/java/io/sc/platform/system/menu/service/impl/MenuServiceImpl.java b/io.sc.platform.system/src/main/java/io/sc/platform/system/menu/service/impl/MenuServiceImpl.java
index 5f9b25af..fff1c5ac 100644
--- a/io.sc.platform.system/src/main/java/io/sc/platform/system/menu/service/impl/MenuServiceImpl.java
+++ b/io.sc.platform.system/src/main/java/io/sc/platform/system/menu/service/impl/MenuServiceImpl.java
@@ -195,27 +195,27 @@ public class MenuServiceImpl extends DaoServiceImpl<MenuEntity, String, MenuRepo
 
     @Override
     public List<MenuVo> listAllMenusWithSelectedStatusByApplication(String applicationId, QueryParameter queryParameter) throws Exception {
+        if(!StringUtils.hasText(applicationId)){
+            return Collections.emptyList();
+        }
         Sort sort =queryParameter.getSort();
         if(sort==null){
             queryParameter.addSortBy("order");
         }
-        if(StringUtils.hasText(applicationId)) {
-            List<MenuEntity> allMenuEntities = repository.findAll();
-            List<MenuEntity> selectedMenuEntities = listMenusByApplication(applicationId, queryParameter);
-            List<MenuVo> allMenus = EntityVoUtil.toVo(allMenuEntities);
-            List<MenuVo> selectedMenus = EntityVoUtil.toVo(selectedMenuEntities);
-            Set<String> selectedMenuIds = new HashSet<>();
-            for (MenuVo selectedMenu : selectedMenus) {
-                selectedMenuIds.add(selectedMenu.getId());
+        List<MenuEntity> allMenuEntities = repository.findAll();
+        List<MenuEntity> selectedMenuEntities = listMenusByApplication(applicationId, queryParameter);
+        List<MenuVo> allMenus = EntityVoUtil.toVo(allMenuEntities);
+        List<MenuVo> selectedMenus = EntityVoUtil.toVo(selectedMenuEntities);
+        Set<String> selectedMenuIds = new HashSet<>();
+        for (MenuVo selectedMenu : selectedMenus) {
+            selectedMenuIds.add(selectedMenu.getId());
+        }
+        for (MenuVo allMenu : allMenus) {
+            if (selectedMenuIds.contains(allMenu.getId())) {
+                allMenu.setTicked(true);
             }
-            for (MenuVo allMenu : allMenus) {
-                if (selectedMenuIds.contains(allMenu.getId())) {
-                    allMenu.setTicked(true);
-                }
-            }
-            return allMenus;
         }
-        return Collections.emptyList();
+        return allMenus;
     }
 
     @Override