组织架构图多语言 key值问题处理

src/com/engine/organization/service/ChartService.java

@@ -100,7 +100,7 @@ public interface ChartService {
      * @param: []
      * @return: java.util.Map<java.lang.Integer,com.engine.organization.entity.chart.HrmLabelVO>
      */
-    Map<Integer, HrmLabelVO> selectLabel();
+    Map<String, HrmLabelVO> selectLabel();
 
     /**
      * @Description: 历史版本删除

src/com/engine/organization/service/impl/ChartServiceImpl.java

@@ -715,9 +715,9 @@ public class ChartServiceImpl extends Service implements ChartService {
     }
 
     @Override
-    public Map<Integer, HrmLabelVO> selectLabel() {
+    public Map<String, HrmLabelVO> selectLabel() {
         RecordSet rs = new RecordSet();
-        Map<Integer, HrmLabelVO> labelData = new HashMap<>();
+        Map<String, HrmLabelVO> labelData = new HashMap<>();
         //labelId集合
         List<Integer> labelIds = Arrays.asList(547190,547194,547196,547262,547282,547283,547284,547285,547286,547287,547292,547293,547294,547296,547298,547299,547300,547301,547302,547303,547304,547305,547307,547310,547313,547314,547315,547316,547317,
                 547318,547319,547320,547321,547322,547323,547324,547326,547327,547328,547329,547330,547331,547332,547333,547334,547345,547346,547447,547448,547468,547473,547475,547476,547477,547478,547478,547264,547265,547463,547464,547465,
@@ -726,7 +726,7 @@ public class ChartServiceImpl extends Service implements ChartService {
         labelIds.forEach(item -> {
             rs.executeQuery("select labelName from HtmlLabelInfo where indexid = ? and languageid = ?",item,user.getLanguage());
             if (rs.next()){
-                labelData.put(item,HrmLabelVO.builder().labelName(Util.null2String(rs.getString("labelName"))).build());
+                labelData.put(Util.null2String(item),HrmLabelVO.builder().labelName(Util.null2String(rs.getString("labelName"))).build());
             }
 
         });

src/com/engine/organization/wrapper/OrgChartWrapper.java

@@ -91,7 +91,7 @@ public class OrgChartWrapper extends Service {
         return getChartService(user).recordStatistics(param);
     }
 
-    public Map<Integer, HrmLabelVO> selectLabel() {
+    public Map<String, HrmLabelVO> selectLabel() {
         return getChartService(user).selectLabel();
     }