bugfix: fix getMenuAppInstances with EN

WeBankFinTech · Jul 3, 2020 · dd92f22 · dd92f22
1 parent 3fd256a
commit dd92f22
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/WorkspaceMapper.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/WorkspaceMapper.java
@@ -39,7 +39,7 @@ public interface WorkspaceMapper {
     List<OnestopMenuVo> getApplicationMenuEn();
 
     List<OnestopMenuAppInstanceVo> getMenuAppInstancesCn(Long id);
-    List<OnestopMenuAppInstanceVo> getMenuAppInstanceEn(Long id);
+    List<OnestopMenuAppInstanceVo> getMenuAppInstancesEn(Long id);
 
     List<WorkspaceFavoriteVo> getWorkspaceFavoritesCn(@Param("username") String username, @Param("workspaceId") Long workspaceId);
 

diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/workspaceMapper.xml b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/dao/impl/workspaceMapper.xml
@@ -31,7 +31,7 @@
     </sql>
     <sql id="menu_appInstances_en">
         m.`id`,m.`title_en` AS `title`, m.`desc_en` AS `description`,m.`labels_en` AS `labels`,
-        m.`access_button_en` AS `access_button`,m.`manual_button_en` AS `manualButton`,m.`is_active`
+        m.`access_button_en` AS `access_button`,m.`manual_button_en` AS `manualButton`,m.`is_active`,
         m.`manual_button_url`,m.`icon`,m.`order`,app.`homepage_url` AS `access_button_url`,app.project_url, app.`name`
     </sql>
 

diff --git a/...rc/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSWorkspaceServiceImpl.java b/...rc/main/java/com/webank/wedatasphere/dss/server/service/impl/DSSWorkspaceServiceImpl.java
@@ -94,7 +94,7 @@ public List<OnestopMenuVo> getWorkspaceManagements(Long workspaceId, String user
     private List<OnestopMenuVo> getMenuAppInstances(List<OnestopMenuVo> menuVos, boolean isChinese) {
         for (OnestopMenuVo menuVo : menuVos) {
             Long menuId = menuVo.getId();
-            List<OnestopMenuAppInstanceVo> menuAppInstanceVos = isChinese ? workspaceMapper.getMenuAppInstancesCn(menuId) : workspaceMapper.getMenuAppInstanceEn(menuId);
+            List<OnestopMenuAppInstanceVo> menuAppInstanceVos = isChinese ? workspaceMapper.getMenuAppInstancesCn(menuId) : workspaceMapper.getMenuAppInstancesEn(menuId);
             menuVo.setAppInstances(menuAppInstanceVos);
         }
         return menuVos;